Organize imports with prettier

package.json

@@ -63,6 +63,10 @@
       "prettier --write"
     ]
   },
+  "prettier":{
+    "plugins": [
+      "prettier-plugin-organize-imports"]
+  },
   "devDependencies": {
     "@mui/types": "7.2.20",
     "@testing-library/react": "14.3.1",
@@ -82,6 +86,7 @@
     "jsdom": "25.0.1",
     "lint-staged": "15.2.11",
     "prettier": "3.4.2",
+    "prettier-plugin-organize-imports": "4.1.0",
     "redux-devtools": "3.7.0",
     "source-map-explorer": "2.5.3",
     "typescript": "5.7.2",

src/actions/AssessmentActions.js

@@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import * as types from "./Types";
 import * as limitations from "../models/Limitations";
 import { createThunk } from "./";
+import * as types from "./Types";
 
 var AssessmentActions = {};
 

src/actions/EquipmentActions.js

@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import * as types from "./Types";
 import { createThunk } from "./";
+import * as types from "./Types";
 
 var EquipmentActions = {};
 

src/actions/StopPlaceActions.js

@@ -12,13 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import * as types from "./Types";
-import { getCentroid } from "../utils/mapUtils";
-import { UserActions } from ".";
+import { createThunk, UserActions } from ".";
+import { Entities } from "../models/Entities";
 import { getIn } from "../utils";
+import { getCentroid } from "../utils/mapUtils";
 import { updateURLWithId } from "../utils/URLhelpers";
-import { createThunk } from ".";
-import { Entities } from "../models/Entities";
+import * as types from "./Types";
 
 var StopPlaceActions = {};
 

src/actions/StopPlacesGroupActions.js

@@ -12,14 +12,13 @@
  See the Licence for the specific language governing permissions and
  limitations under the Licence. */
 
-import * as types from "./Types";
-import { createThunk } from "./";
 import {
-  getStopPlaceById,
   getAddStopPlaceInfo,
+  getStopPlaceById,
 } from "../actions/TiamatActions";
-import { UserActions } from "./";
 import Routes from "../routes/";
+import { createThunk, UserActions } from "./";
+import * as types from "./Types";
 
 var StopPlacesGroupActions = {};
 

src/actions/TiamatActions.js

@@ -13,54 +13,54 @@ See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
 import {
+  deleteGroupMutation,
+  deleteParkingMutation,
+  mutateAddToMultiModalStopPlace,
+  mutateCreateMultiModalStopPlace,
+  mutateCreateTag,
   mutateDeleteQuay,
   mutateDeleteStopPlace,
+  mutateGroupOfStopPlaces,
   mutateMergeQuays,
   mutateMergeStopPlaces,
-  mutateMoveQuaysToStop,
   mutateMoveQuaysToNewStop,
+  mutateMoveQuaysToStop,
   mutateParentStopPlace,
-  mutateAddToMultiModalStopPlace,
-  mutateCreateMultiModalStopPlace,
-  removeStopPlaceFromParent,
-  mutateStopPlace,
-  updateChildOfParentStop,
+  mutateParking,
+  mutatePathLink,
   mutateRemoveTag,
-  mutateCreateTag,
+  mutateStopPlace,
   mutateTerminateStopPlace,
-  mutateGroupOfStopPlaces,
-  deleteGroupMutation,
-  deleteParkingMutation,
-  mutatePathLink,
-  mutateParking,
+  removeStopPlaceFromParent,
+  updateChildOfParentStop,
 } from "../graphql/Tiamat/mutations";
 import {
-  allVersionsOfStopPlace,
   allEntities,
-  stopPlaceBBQuery,
-  getMergeInfoStopPlace,
-  topopGraphicalPlacesQuery,
+  allVersionsOfStopPlace,
   findStop,
-  getStopPlacesById,
-  getPolygons as getPolygonsQuery,
-  getTagsQuery,
+  findStopForReport as findStopForReportQuery,
   findTagByNameQuery,
-  getStopById,
+  getGroupOfStopPlaceQuery,
+  getMergeInfoStopPlace,
+  getParkingForMultipleStopPlaces as getParkingForMultipleStopPlacesQuery,
+  getPolygons as getPolygonsQuery,
   getQueryTopographicPlaces,
+  getStopById,
+  getStopPlacesById,
   getTagsByNameQuery,
-  getGroupOfStopPlaceQuery,
+  getTagsQuery,
+  neighbourStopPlaceQuays,
   stopPlaceAndPathLinkByVersion,
-  findStopForReport as findStopForReportQuery,
-  getParkingForMultipleStopPlaces as getParkingForMultipleStopPlacesQuery,
+  stopPlaceBBQuery,
+  topopGraphicalPlacesQuery,
   topopGraphicalPlacesReportQuery,
-  neighbourStopPlaceQuays,
 } from "../graphql/Tiamat/queries";
 import mapToMutationVariables from "../modelUtils/mapToQueryVariables";
 
-import { createApolloErrorThunk, createApolloThunk } from ".";
-import * as types from "./Types";
 import { v4 as uuidv4 } from "uuid";
+import { createApolloErrorThunk, createApolloThunk } from ".";
 import { getTiamatClient } from "../graphql/clients";
+import * as types from "./Types";
 
 export const getContext = async (auth) => {
   let token;

src/actions/UserActions.js

@@ -12,20 +12,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import * as types from "./Types";
-import configureLocalization from "../localization/localization";
-import FavoriteManager from "../singletons/FavoriteManager";
-import SettingsManager from "../singletons/SettingsManager";
+import { push } from "redux-first-history";
 import {
-  getMergeInfoForStops,
   getAddStopPlaceInfo,
+  getMergeInfoForStops,
 } from "../actions/TiamatActions";
-import { getIn } from "../utils/";
+import { checkQuayUsage, checkStopPlaceUsage } from "../graphql/OTP/actions";
+import configureLocalization from "../localization/localization";
 import ParentStopPlace from "../models/ParentStopPlace";
 import Routes from "../routes/";
+import FavoriteManager from "../singletons/FavoriteManager";
+import SettingsManager from "../singletons/SettingsManager";
+import { getIn } from "../utils/";
 import { createThunk } from "./";
-import { checkStopPlaceUsage, checkQuayUsage } from "../graphql/OTP/actions";
-import { push } from "redux-first-history";
+import * as types from "./Types";
 
 var UserActions = {};
 

src/actions/index.ts

@@ -12,19 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import StopPlaceActions from "./StopPlaceActions";
-import UserActions from "./UserActions";
+import { getOperationAST } from "graphql";
 import AssessmentActions from "./AssessmentActions";
 import EquipmentActions from "./EquipmentActions";
+import StopPlaceActions from "./StopPlaceActions";
 import StopPlacesGroupActions from "./StopPlacesGroupActions";
-import { getOperationAST } from "graphql";
+import UserActions from "./UserActions";
 
 export {
-  StopPlaceActions,
-  UserActions,
   AssessmentActions,
   EquipmentActions,
+  StopPlaceActions,
   StopPlacesGroupActions,
+  UserActions,
 };
 
 export const createThunk = (type: string, payload: any) => ({

src/auth/auth.test.tsx

@@ -1,9 +1,9 @@
 import { renderHook } from "@testing-library/react";
 
-import { useAuth } from "./auth";
 import { ConfigContext } from "../config/ConfigContext";
+import { useAuth } from "./auth";
 
-import { describe, test, expect, vi } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 
 vi.mock("react-oidc-context", async () => {
   return {

src/auth/auth.tsx

@@ -1,7 +1,6 @@
-import { useCallback, useEffect } from "react";
+import { useCallback } from "react";
 import {
   AuthProvider as OidcAuthProvider,
-  hasAuthParams,
   useAuth as useOidcAuth,
 } from "react-oidc-context";
 import { useConfig } from "../config/ConfigContext";

src/components/Dialogs/AddAdjacentStopsDialog.js

@@ -12,11 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React from "react";
-import PropTypes from "prop-types";
-import { injectIntl } from "react-intl";
-import { connect } from "react-redux";
-import AddStopPlaceSuggestionListItem from "./AddStopPlaceSuggestionListItem";
 import {
   Box,
   Button,
@@ -25,6 +20,11 @@ import {
   DialogContent,
   DialogTitle,
 } from "@mui/material";
+import PropTypes from "prop-types";
+import React from "react";
+import { injectIntl } from "react-intl";
+import { connect } from "react-redux";
+import AddStopPlaceSuggestionListItem from "./AddStopPlaceSuggestionListItem";
 
 class AddAdjacentStopDialog extends React.Component {
   constructor(props) {

src/components/Dialogs/AddMemberToGroup.js

@@ -12,12 +12,6 @@
  See the Licence for the specific language governing permissions and
  limitations under the Licence. */
 
-import React, { Component } from "react";
-import { injectIntl } from "react-intl";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { getGroupMemberSuggestions } from "../../modelUtils/leafletUtils";
-import AddStopPlaceSuggestionList from "./AddStopPlaceSuggestionList";
 import {
   Box,
   Button,
@@ -26,6 +20,12 @@ import {
   DialogContent,
   DialogTitle,
 } from "@mui/material";
+import PropTypes from "prop-types";
+import { Component } from "react";
+import { injectIntl } from "react-intl";
+import { connect } from "react-redux";
+import { getGroupMemberSuggestions } from "../../modelUtils/leafletUtils";
+import AddStopPlaceSuggestionList from "./AddStopPlaceSuggestionList";
 
 class AddMemberToGroup extends Component {
   constructor(props) {

src/components/Dialogs/AddStopPlaceSuggestionList.js

@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React, { Component } from "react";
 import PropTypes from "prop-types";
+import { Component } from "react";
 import AddStopPlaceSuggestionListItem from "./AddStopPlaceSuggestionListItem";
 
 class AddStopPlaceSuggestionList extends Component {

src/components/Dialogs/AddStopPlaceSuggestionListItem.js

@@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React, { Component } from "react";
-import PropTypes from "prop-types";
+import { FormControlLabel } from "@mui/material";
 import Checkbox from "@mui/material/Checkbox";
-import ModalityIconImg from "../MainPage/ModalityIconImg";
+import PropTypes from "prop-types";
+import { Component } from "react";
 import { injectIntl } from "react-intl";
 import HasExpiredInfo from "../MainPage/HasExpiredInfo";
-import { FormControlLabel } from "@mui/material";
+import ModalityIconImg from "../MainPage/ModalityIconImg";
 
 class AddStopPlaceSuggestionListItem extends Component {
   render() {

src/components/Dialogs/AddStopPlaceToParent.js

@@ -12,12 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React, { Component } from "react";
-import { injectIntl } from "react-intl";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { getChildStopPlaceSuggestions } from "../../modelUtils/leafletUtils";
-import AddStopPlaceSuggestionList from "./AddStopPlaceSuggestionList";
 import {
   Box,
   Button,
@@ -27,6 +21,12 @@ import {
   DialogContent,
   DialogTitle,
 } from "@mui/material";
+import PropTypes from "prop-types";
+import { Component } from "react";
+import { injectIntl } from "react-intl";
+import { connect } from "react-redux";
+import { getChildStopPlaceSuggestions } from "../../modelUtils/leafletUtils";
+import AddStopPlaceSuggestionList from "./AddStopPlaceSuggestionList";
 
 class AddStopPlaceToParent extends Component {
   constructor(props) {

src/components/Dialogs/AltNamesDialog.js

@@ -12,18 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React from "react";
-import { connect } from "react-redux";
 import MdDelete from "@mui/icons-material/Delete";
-import * as altNameConfig from "../../config/altNamesConfig";
 import MdEdit from "@mui/icons-material/ModeEdit";
 import IconButton from "@mui/material/IconButton";
+import React from "react";
+import { connect } from "react-redux";
 import { StopPlaceActions } from "../../actions/";
-import ConfirmDialog from "./ConfirmDialog";
+import * as altNameConfig from "../../config/altNamesConfig";
 import { getPrimaryColor } from "../../config/themeConfig";
-import NewAltName from "./NewAltName";
-import EditAltName from "./EditAltName";
+import ConfirmDialog from "./ConfirmDialog";
 import DialogHeader from "./DialogHeader";
+import EditAltName from "./EditAltName";
+import NewAltName from "./NewAltName";
 
 class AltNamesDialog extends React.Component {
   constructor(props) {