Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(nms): Consolidate text components #12502

Merged
merged 1 commit into from
Apr 28, 2022
Merged

refactor(nms): Consolidate text components #12502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion nms/app/components/GatewayCellularFields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import MagmaV1API from '../../generated/WebClient';
import MenuItem from '@material-ui/core/MenuItem';
import React, {useState} from 'react';
import Select from '@material-ui/core/Select';
import Text from '../../fbc_js_core/ui/components/design-system/Text';
import Text from '../theme/design-system/Text';

import nullthrows from '../../fbc_js_core/util/nullthrows';
import {makeStyles} from '@material-ui/styles';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/GatewaySummaryFields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import FormField from './FormField';
import Input from '@material-ui/core/Input';
import MagmaV1API from '../../generated/WebClient';
import React from 'react';
import Text from '../../fbc_js_core/ui/components/design-system/Text';
import Text from '../theme/design-system/Text';
import moment from 'moment';

import nullthrows from '../../fbc_js_core/util/nullthrows';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/Gateways.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';
import Text from '../../fbc_js_core/ui/components/design-system/Text';
import Text from '../theme/design-system/Text';

import LoadingFiller from '../../fbc_js_core/ui/components/LoadingFiller';
import nullthrows from '../../fbc_js_core/util/nullthrows';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/Subscribers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import TableCell from '@material-ui/core/TableCell';
import TableFooter from '@material-ui/core/TableFooter';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';
import Text from '../../fbc_js_core/ui/components/design-system/Text';
import Text from '../theme/design-system/Text';

import nullthrows from '../../fbc_js_core/util/nullthrows';
import useMagmaAPI from '../../api/useMagmaAPI';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/UsersSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';
import Text from '../../fbc_js_core/ui/components/design-system/Text';
import Text from '../theme/design-system/Text';
import axios from 'axios';
import {UserRoles} from '../../fbc_js_core/auth/types';

Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/VersionTooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import React from 'react';

import AppContext from '../../fbc_js_core/ui/context/AppContext';
import Text from '../../fbc_js_core/ui/components/design-system/Text';
import Text from '../theme/design-system/Text';
import Tooltip from '@material-ui/core/Tooltip';
import {makeStyles} from '@material-ui/styles';

Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/admin/userManagement/UsersSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';
import Text from '../../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../../theme/design-system/Text';
import axios from 'axios';
import {UserRoles} from '../../../../fbc_js_core/auth/types';

Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/cwf/CWFGatewayConfigFields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import Divider from '@material-ui/core/Divider';
import IconButton from '@material-ui/core/IconButton';
import React from 'react';
import RemoveCircleOutline from '@material-ui/icons/RemoveCircleOutline';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import TextField from '@material-ui/core/TextField';

import {makeStyles} from '@material-ui/styles';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/insights/AsyncMetric.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import CircularProgress from '@material-ui/core/CircularProgress';
import MagmaV1API from '../../../generated/WebClient';
import React from 'react';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import moment from 'moment';
import {Line} from 'react-chartjs-2';

Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/insights/Metrics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import FormControl from '@material-ui/core/FormControl';
import GridList from '@material-ui/core/GridList';
import GridListTile from '@material-ui/core/GridListTile';
import InputLabel from '@material-ui/core/InputLabel';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import TextField from '@material-ui/core/TextField';
import TimeRangeSelector from './TimeRangeSelector';

Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/insights/NetworkMetrics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import CardContent from '@material-ui/core/CardContent';
import GridList from '@material-ui/core/GridList';
import GridListTile from '@material-ui/core/GridListTile';
import React from 'react';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import TimeRangeSelector from '../insights/TimeRangeSelector';

import {makeStyles} from '@material-ui/styles';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/lte/Enodebs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';

import nullthrows from '../../../fbc_js_core/util/nullthrows';
import useMagmaAPI from '../../../api/useMagmaAPI';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/network/PoliciesConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import Toolbar from '@material-ui/core/Toolbar';

import nullthrows from '../../../fbc_js_core/util/nullthrows';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/network/PolicyFlowFields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import Input from '@material-ui/core/Input';
import InputLabel from '@material-ui/core/InputLabel';
import React from 'react';
import RemoveCircleOutline from '@material-ui/icons/RemoveCircleOutline';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import TextField from '@material-ui/core/TextField';
import TypedSelect from '../../../fbc_js_core/ui/components/TypedSelect';

Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/network/UpgradeConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import Toolbar from '@material-ui/core/Toolbar';
import UpgradeStatusTierID from './UpgradeStatusTierID';
import UpgradeTierEditDialog from './UpgradeTierEditDialog';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/components/rhino/MultiMetrics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import MagmaV1API from '../../../generated/WebClient';
import MenuItem from '@material-ui/core/MenuItem';
import React from 'react';
import Select from '@material-ui/core/Select';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import TimeRangeSelector from '../insights/TimeRangeSelector';
import {Route} from 'react-router-dom';

Expand Down
2 changes: 1 addition & 1 deletion nms/app/views/equipment/GatewayDetailConfigEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import Select from '@material-ui/core/Select';
import Switch from '@material-ui/core/Switch';
import Tab from '@material-ui/core/Tab';
import Tabs from '@material-ui/core/Tabs';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import nullthrows from '../../../fbc_js_core/util/nullthrows';

import {AltFormField} from '../../components/FormField';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/views/equipment/UpgradeTiersDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import Paper from '@material-ui/core/Paper';
import React from 'react';
import Tab from '@material-ui/core/Tab';
import Tabs from '@material-ui/core/Tabs';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import {AutoCompleteEditComponent} from '../../components/ActionTable';

import {colors, typography} from '../../theme/default';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/views/metrics/CloudMetrics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import CardContent from '@material-ui/core/CardContent';
import GridList from '@material-ui/core/GridList';
import GridListTile from '@material-ui/core/GridListTile';
import React from 'react';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';
import TimeRangeSelector from '../../components/insights/TimeRangeSelector';

import {makeStyles} from '@material-ui/styles';
Expand Down
2 changes: 1 addition & 1 deletion nms/app/views/subscriber/SubscriberApnStaticIpsEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import MenuItem from '@material-ui/core/MenuItem';
import OutlinedInput from '@material-ui/core/OutlinedInput';
import React from 'react';
import Select from '@material-ui/core/Select';
import Text from '../../../fbc_js_core/ui/components/design-system/Text';
import Text from '../../theme/design-system/Text';

import {AltFormField} from '../../components/FormField';
import {makeStyles} from '@material-ui/styles';
Expand Down
2 changes: 1 addition & 1 deletion nms/fbc_js_core/ui/components/ActionTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import RefreshIcon from '@material-ui/icons/Refresh';
import Remove from '@material-ui/icons/Remove';
import SaveAlt from '@material-ui/icons/SaveAlt';
import Search from '@material-ui/icons/Search';
import Text from './design-system/Text';
import Text from '../../../app/theme/design-system/Text';

import {forwardRef} from 'react';
import {makeStyles} from '@material-ui/styles';
Expand Down
2 changes: 1 addition & 1 deletion nms/fbc_js_core/ui/components/Alert/Alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import DialogActions from '@material-ui/core/DialogActions';
import DialogContent from '@material-ui/core/DialogContent';
import DialogTitle from '@material-ui/core/DialogTitle';
import React, {useState} from 'react';
import Text from '../design-system/Text';
import Text from '../../../../app/theme/design-system/Text';
import {makeStyles} from '@material-ui/styles';

const useStyles = makeStyles(theme => ({
Expand Down
2 changes: 1 addition & 1 deletion nms/fbc_js_core/ui/components/SnackbarItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import CheckCircleIcon from '@material-ui/icons/CheckCircle';
import CloseIcon from '@material-ui/icons/Close';
import ErrorIcon from '@material-ui/icons/Error';
import InfoIcon from '@material-ui/icons/Info';
import Text from './design-system/Text';
import Text from '../../../app/theme/design-system/Text';
import WarningIcon from '@material-ui/icons/Warning';
import classNames from 'classnames';
import {blue60, gray4, green, red, yellow} from '../theme/colors';
Expand Down
2 changes: 1 addition & 1 deletion nms/fbc_js_core/ui/components/auth/LoginForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import CardActions from '@material-ui/core/CardActions';
import CardContent from '@material-ui/core/CardContent';
import FormLabel from '@material-ui/core/FormLabel';
import React from 'react';
import Text from '../design-system/Text';
import Text from '../../../../app/theme/design-system/Text';
import TextField from '@material-ui/core/TextField';
import {withStyles} from '@material-ui/core/styles';

Expand Down
2 changes: 1 addition & 1 deletion nms/fbc_js_core/ui/components/design-system/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import typeof SvgIcon from '@material-ui/core/@@SvgIcon';
import type {TRefFor} from './types/TRefFor.flow';

import * as React from 'react';
import Text from './Text';
import Text from '../../../../app/theme/design-system/Text';
import classNames from 'classnames';
import symphony from '../../theme/symphony';
import {comet} from '../../theme/colors';
Expand Down
2 changes: 1 addition & 1 deletion nms/fbc_js_core/ui/components/design-system/FormField/FormField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import * as React from 'react';
import FormAlertsContext from '../Form/FormAlertsContext';
import FormElementContext from '../Form/FormElementContext';
import Text from '../Text';
import Text from '../../../../../app/theme/design-system/Text';
import classNames from 'classnames';
import grey from '@material-ui/core/colors/grey';
import nullthrows from 'nullthrows';
Expand Down
2 changes: 1 addition & 1 deletion nms/fbc_js_core/ui/components/design-system/Input/InputAffix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import * as React from 'react';
import SymphonyTheme from '../../../theme/symphony';
import Text from '../Text';
import Text from '../../../../../app/theme/design-system/Text';
import classNames from 'classnames';
import {makeStyles} from '@material-ui/styles';
import {useFormElementContext} from '../Form/FormElementContext';
Expand Down
2 changes: 1 addition & 1 deletion nms/fbc_js_core/ui/components/design-system/Input/TextInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import type {TRefFor} from '../types/TRefFor.flow';
import * as React from 'react';
import FormElementContext from '../Form/FormElementContext';
import InputContext from './InputContext';
import Text from '../Text';
import Text from '../../../../../app/theme/design-system/Text';
import classNames from 'classnames';
import symphony from '../../../theme/symphony';
import {makeStyles} from '@material-ui/styles';
Expand Down
2 changes: 1 addition & 1 deletion nms/fbc_js_core/ui/components/design-system/Select/Select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
import BasePopoverTrigger from '../ContexualLayer/BasePopoverTrigger';
import Button from '../Button';
import SelectMenu from './SelectMenu';
import Text from '../Text';
import Text from '../../../../../app/theme/design-system/Text';
import classNames from 'classnames';
import symphony from '../../../../../fbc_js_core/ui/theme/symphony';
import {makeStyles} from '@material-ui/styles';
Expand Down
2 changes: 1 addition & 1 deletion nms/fbc_js_core/ui/components/design-system/Select/SelectMenuItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import type {
import * as React from 'react';
import FormAction from '../../../../../fbc_js_core/ui/components/design-system/Form/FormAction';
import FormElementContext from '../../../../../fbc_js_core/ui/components/design-system/Form/FormElementContext';
import Text from '../Text';
import Text from '../../../../../app/theme/design-system/Text';
import classNames from 'classnames';
import symphony from '../../../theme/symphony';
import {makeStyles} from '@material-ui/styles';
Expand Down