Skip to content

Front-end import cleanup #2517

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

Merged
timyates merged 2 commits into from
Jun 19, 2024
Merged

Front-end import cleanup #2517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7190620
[sonar] Imports from the same module should be merged
timyates Jun 19, 2024
82df052
[sonar] Unnecessary imports should be removed
timyates Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion web-ui/src/api/feedback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import qs from 'qs';
import { resolve } from './api.js';
import { getFeedbackTemplateWithQuestions } from './feedbacktemplate.js';

Expand Down
1 change: 0 additions & 1 deletion web-ui/src/api/notifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { resolve } from './api.js';
import { getMember } from './member.js';

const emailNotificationURL = '/services/email-notifications';
const emailURL = '/services/email';
Expand Down
1 change: 0 additions & 1 deletion web-ui/src/components/admin/users/Users.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import AdminMemberCard from '../../member-directory/AdminMemberCard';
import MemberModal from '../../member-directory/MemberModal';
import {
createMember,
getMember,
reportAllMembersCsv
} from '../../../api/member';
import { AppContext } from '../../../context/AppContext';
Expand Down
6 changes: 1 addition & 5 deletions web-ui/src/components/celebrations/Anniversaries.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@ import {
} from '../../context/selectors';
import SkeletonLoader from '../skeleton_loader/SkeletonLoader';

import { Card, CardHeader } from '@mui/material';
import { Card, CardHeader, Grid, Typography } from '@mui/material';
import Avatar from '@mui/material/Avatar';

import { Grid } from '@mui/material';

import './Anniversaries.css';

import { Typography } from '@mui/material';

const PREFIX = 'MemberSummaryCard';
const classes = {
header: `${PREFIX}-header`
Expand Down
1 change: 0 additions & 1 deletion web-ui/src/components/checkin/CheckinHistory.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import IconButton from '@mui/material/IconButton';
import ArrowBackIcon from '@mui/icons-material/ArrowBack';
import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
import { MobileDateTimePicker } from '@mui/x-date-pickers';
import TextField from '@mui/material/TextField';

import './Checkin.css';

Expand Down
1 change: 0 additions & 1 deletion web-ui/src/components/dialogs/AlertDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import PropTypes from 'prop-types';
import React, { useCallback, useState } from 'react';

import {
Button,
Expand Down
2 changes: 1 addition & 1 deletion web-ui/src/components/dialogs/ConfirmationDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types';
import React, { useCallback, useState } from 'react';
import React, { useCallback } from 'react';

import {
Button,
Expand Down
3 changes: 1 addition & 2 deletions web-ui/src/components/edit_skills/EditSkillsModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import { combineSkill } from '../../api/skill';
import { getMemberSkills } from '../../api/memberskill';

import Autocomplete from '@mui/material/Autocomplete';
import { Checkbox, Modal, TextField } from '@mui/material';
import { Button } from '@mui/material';
import { Button, Checkbox, Modal, TextField } from '@mui/material';
import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank';
import CheckBoxIcon from '@mui/icons-material/CheckBox';

Expand Down
4 changes: 2 additions & 2 deletions web-ui/src/components/feedback_recipient_card/FeedbackRecipientCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { styled } from '@mui/material/styles';
import { AppContext } from '../../context/AppContext';
import { selectProfileMap } from '../../context/selectors';
import { getAvatarURL } from '../../api/api.js';
import { Card, CardHeader } from '@mui/material';
import { Box, Card, CardHeader, CardContent, Container, Typography } from '@mui/material';
import Avatar from '@mui/material/Avatar';
import PriorityHighIcon from '@mui/icons-material/PriorityHigh';
import { green } from '@mui/material/colors';
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
import Divider from '@mui/material/Divider';

import './FeedbackRecipientCard.css';
import { Box, CardContent, Container, Typography } from '@mui/material';

const PREFIX = 'FeedbackRecipientCard';
const classes = {
Expand Down
5 changes: 3 additions & 2 deletions web-ui/src/components/feedback_recipient_selector/FeedbackRecipientSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
import React, { useContext, useEffect, useState, useRef } from 'react';
import { styled } from '@mui/material/styles';
import './FeedbackRecipientSelector.css';
Copy link
Collaborator

@mvolkmann mvolkmann Jun 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At first I thought this import was removed, but I see now that it was just moved down. That's fine.

Copy link
Contributor Author

@timyates timyates Jun 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I tried to arrange them all to kind of match each other... In the main the css import comes just prior to the const values

Copy link
Collaborator

@mvolkmann mvolkmann Jun 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That matches my preference.

import FeedbackRecipientCard from '../feedback_recipient_card/FeedbackRecipientCard';
import { AppContext } from '../../context/AppContext';
import {
selectProfile,
selectCsrfToken,
selectCurrentUser,
selectNormalizedMembers
} from '../../context/selectors';
import { getFeedbackSuggestion } from '../../api/feedback';
import { selectCurrentUser } from '../../context/selectors';
import Typography from '@mui/material/Typography';
import { TextField, Grid, InputAdornment } from '@mui/material';
import { Search } from '@mui/icons-material';
import PropTypes from 'prop-types';

import './FeedbackRecipientSelector.css';

const PREFIX = 'FeedbackRecipientSelector';
const classes = {
search: `${PREFIX}-search`,
Expand Down
6 changes: 3 additions & 3 deletions web-ui/src/components/feedback_template_selector/FeedbackTemplateSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ import React, {
import TemplateCard from '../template-card/TemplateCard';
import TemplatePreviewModal from '../template-preview-modal/TemplatePreviewModal';
import PropTypes from 'prop-types';
import { InputAdornment, TextField } from '@mui/material';
import { InputAdornment, TextField, Tooltip } from '@mui/material';
import Button from '@mui/material/Button';
import { Tooltip } from '@mui/material';
import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
import {
createFeedbackTemplateWithQuestion,
getAllFeedbackTemplates
} from '../../api/feedbacktemplate';
import { AppContext } from '../../context/AppContext';
import { selectCsrfToken, selectCurrentUser } from '../../context/selectors';
import './FeedbackTemplateSelector.css';
import { Search } from '@mui/icons-material';
import { UPDATE_TOAST } from '../../context/actions';

import './FeedbackTemplateSelector.css';

const propTypes = {
query: PropTypes.string,
changeQuery: PropTypes.func
Expand Down
4 changes: 2 additions & 2 deletions web-ui/src/components/guild-results/GuildSummaryCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, { useContext, useState, useCallback } from 'react';
import { Link } from 'react-router-dom';

import { Construction, Groups } from '@mui/icons-material';
import { Link as StyledLink } from '@mui/material';
import { styled } from '@mui/material/styles';

import { AppContext } from '../../context/AppContext';
Expand All @@ -20,10 +19,11 @@ import {
DialogTitle,
DialogContent,
DialogActions,
Link as StyledLink,
Tooltip
} from '@mui/material';
import PropTypes from 'prop-types';
import { deleteGuild, getGuildLeaders, updateGuild } from '../../api/guild.js';
import { deleteGuild, updateGuild } from '../../api/guild.js';
import SplitButton from '../split-button/SplitButton';

const PREFIX = 'GuildSummaryCard';
Expand Down
11 changes: 7 additions & 4 deletions web-ui/src/components/member-directory/AdminMemberCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,36 @@ import { Link } from 'react-router-dom';

import MemberModal from './MemberModal';
import { AppContext } from '../../context/AppContext';
import { UPDATE_MEMBER_PROFILES } from '../../context/actions';
import { DELETE_MEMBER_PROFILE, UPDATE_MEMBER_PROFILES, UPDATE_TOAST } from '../../context/actions';
import { selectProfileMap } from '../../context/selectors';
import { getAvatarURL } from '../../api/api.js';

import { Card, CardActions, CardHeader, Tooltip } from '@mui/material';
import Avatar from '@mui/material/Avatar';
import PriorityHighIcon from '@mui/icons-material/PriorityHigh';

import './MemberSummaryCard.css';
import SplitButton from '../split-button/SplitButton';

import { updateMember, deleteMember } from '../../api/member.js';
import { DELETE_MEMBER_PROFILE, UPDATE_TOAST } from '../../context/actions.js';

import {
Box,
Button,
Card,
CardActions,
CardContent,
CardHeader,
Container,
Dialog,
DialogActions,
DialogContent,
DialogContentText,
DialogTitle,
Tooltip,
Typography
} from '@mui/material';

import './MemberSummaryCard.css';

const PREFIX = 'AdminMemberCard';
const classes = {
header: `${PREFIX}-header`
Expand Down
6 changes: 2 additions & 4 deletions web-ui/src/components/member-directory/MemberModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
import React, { useContext, useState } from 'react';
import React, { useCallback, useContext, useState } from 'react';
import { AppContext } from '../../context/AppContext';
import {
selectOrderedPdls,
selectOrderedMemberFirstName,
selectCurrentMembers
} from '../../context/selectors';

import { Modal, TextField } from '@mui/material';
import { Button, Modal, TextField } from '@mui/material';
import Autocomplete from '@mui/material/Autocomplete';
import { DatePicker } from '@mui/x-date-pickers';
import { format } from 'date-fns';
import { Button } from '@mui/material';
import { UPDATE_TOAST } from '../../context/actions';

import './MemberModal.css';
import { useCallback } from 'react';

const emptyMember = {
employeeId: '',
Expand Down
8 changes: 5 additions & 3 deletions web-ui/src/components/member-directory/MemberSummaryCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@ import { AppContext } from '../../context/AppContext';
import { selectIsAdmin, selectProfileMap } from '../../context/selectors';
import { getAvatarURL } from '../../api/api.js';

import { Card, CardHeader } from '@mui/material';
import Avatar from '@mui/material/Avatar';
import PriorityHighIcon from '@mui/icons-material/PriorityHigh';

import './MemberSummaryCard.css';

import {
Box,
Card,
CardContent,
CardHeader,
Container,
Tooltip,
Typography
} from '@mui/material';

import './MemberSummaryCard.css';

const PREFIX = 'MemberSummaryCard';
const classes = {
header: `${PREFIX}-header`
Expand Down
2 changes: 1 addition & 1 deletion web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext, useState } from 'react';
import React, { useContext } from 'react';
import {
Accordion,
AccordionSummary,
Expand Down
3 changes: 1 addition & 2 deletions web-ui/src/components/reviews/SelectUserModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React, { useContext, useState, useCallback } from 'react';
import { AppContext } from '../../context/AppContext';
import { selectOrderedMemberFirstName } from '../../context/selectors';
import { Modal, TextField, Box } from '@mui/material';
import { Box, Button, Modal, TextField } from '@mui/material';
import Autocomplete from '@mui/material/Autocomplete';
import { Button } from '@mui/material';
import { UPDATE_TOAST } from '../../context/actions';

const modalStyles = {
Expand Down
20 changes: 9 additions & 11 deletions web-ui/src/components/reviews/TeamMemberReview-old.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
import React, { useContext, useState, useCallback } from 'react';
import { useTheme } from '@mui/material/styles';
import { styled } from '@mui/material/styles';
import { styled, useTheme } from '@mui/material/styles';
import SwipeableViews from 'react-swipeable-views';
import PropTypes from 'prop-types';
import { AppContext } from '../../context/AppContext';
import { selectCurrentUser, selectProfile } from '../../context/selectors';
import AppBar from '@mui/material/AppBar';
import Button from '@mui/material/Button';
import Tabs from '@mui/material/Tabs';
import Tab from '@mui/material/Tab';
import Typography from '@mui/material/Typography';
import { selectCsrfToken, selectCurrentUser, selectProfile } from '../../context/selectors';
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
import HourglassEmptyIcon from '@mui/icons-material/HourglassEmpty';
import Box from '@mui/material/Box';
import {
AppBar,
Box,
Button,
Card,
CardActions,
CardContent,
CardHeader,
Modal
Modal,
Tab,
Tabs,
Typography
} from '@mui/material';
import FeedbackSubmitForm from '../feedback_submit_form/FeedbackSubmitForm';
import SelectUserModal from './SelectUserModal';
import {
cancelFeedbackRequest,
updateFeedbackRequest
} from '../../api/feedback';
import { selectCsrfToken } from '../../context/selectors';
import { UPDATE_TOAST } from '../../context/actions';

const propTypes = {
Expand Down
25 changes: 10 additions & 15 deletions web-ui/src/components/reviews/TeamMemberReview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
import React, { useContext, useState, useCallback } from 'react';
import { useTheme } from '@mui/material/styles';
import { styled } from '@mui/material/styles';
import { styled, useTheme } from '@mui/material/styles';
import SwipeableViews from 'react-swipeable-views';
import PropTypes from 'prop-types';
import { AppContext } from '../../context/AppContext';
import { selectCurrentUser, selectProfile } from '../../context/selectors';
import AppBar from '@mui/material/AppBar';
import Button from '@mui/material/Button';
import Tabs from '@mui/material/Tabs';
import Tab from '@mui/material/Tab';
import Typography from '@mui/material/Typography';
import { selectCsrfToken, selectCurrentUser, selectProfile } from '../../context/selectors';
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
import HourglassEmptyIcon from '@mui/icons-material/HourglassEmpty';
import Box from '@mui/material/Box';
import {
AppBar,
Box,
Button,
Card,
CardActions,
CardContent,
CardHeader,
Modal
Modal,
Tab,
Tabs,
Typography
} from '@mui/material';
import FeedbackSubmitForm from '../feedback_submit_form/FeedbackSubmitForm';
import SelectUserModal from './SelectUserModal';
import {
cancelFeedbackRequest,
updateFeedbackRequest
} from '../../api/feedback';
import { selectCsrfToken } from '../../context/selectors';
import { cancelFeedbackRequest, updateFeedbackRequest } from '../../api/feedback';
import { UPDATE_TOAST } from '../../context/actions';

const propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion web-ui/src/components/reviews/TeamReviews.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import React, {
useRef,
useState
} from 'react';
import { useLocation, useHistory } from 'react-router-dom';
import { useLocation } from 'react-router-dom';

import {
AddCircle,
Expand Down
11 changes: 2 additions & 9 deletions web-ui/src/components/reviews/periods/ReviewPeriods.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,14 @@ import {
} from '@mui/material';

import { useQueryParameters } from '../../../helpers/query-parameters';
import { UPDATE_TOAST } from '../../../context/actions';
import { ADD_REVIEW_PERIOD, UPDATE_REVIEW_PERIODS, UPDATE_TOAST } from '../../../context/actions';

import { styled } from '@mui/material/styles';

import { findSelfReviewRequestsByPeriodAndTeamMember } from '../../../api/feedback.js';
import { getAllFeedbackTemplates } from '../../../api/feedbacktemplate.js';
import {
createReviewPeriod,
getReviewPeriods
} from '../../../api/reviewperiods.js';
import { createReviewPeriod, getReviewPeriods } from '../../../api/reviewperiods.js';
import { AppContext } from '../../../context/AppContext';
import {
ADD_REVIEW_PERIOD,
UPDATE_REVIEW_PERIODS
} from '../../../context/actions';
import {
selectCsrfToken,
selectCurrentUserId,
Expand Down
2 changes: 1 addition & 1 deletion web-ui/src/components/team-results/TeamResults.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext, useEffect, useState } from 'react';
import React, { useContext, useState } from 'react';
import { styled } from '@mui/material/styles';
import TeamSummaryCard from './TeamSummaryCard';
import { AppContext } from '../../context/AppContext';
Expand Down
2 changes: 1 addition & 1 deletion web-ui/src/components/team-results/TeamsActions.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext, useState } from 'react';
import React, { useContext } from 'react';

import AddTeamModal from './EditTeamModal';
import { createTeam } from '../../api/team';
Expand Down
Loading