🌱 Run npm run lint:fix and some minor adjustments (#2729)

sjd78 · web-flow · commit e9cd2c635844 · 2025-11-19T13:20:38.000-05:00
After #2697, run `npm run lint:fix` to apply autofixes. Some additional adjustments were needed after the autofixes were applied. ## Summary by CodeRabbit * **Refactor** * Standardized and consolidated import styles across many components and tests for consistent code formatting; no behavioral changes. * **Chores** * Updated formatting scripts to include an additional ignore path for formatting checks. * **Style** * Removed a lint directive comment from a public asset; no runtime or functional impact. --------- Signed-off-by: Scott J Dickerson <sdickers@redhat.com>
diff --git a/client/public/mockServiceWorker.js b/client/public/mockServiceWorker.js
@@ -1,4 +1,3 @@
-/* eslint-disable */
 /* tslint:disable */
 
 /**
diff --git a/client/src/app/components/answer-table/answer-table.tsx b/client/src/app/components/answer-table/answer-table.tsx
@@ -1,10 +1,11 @@
-import React from "react";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { Label, Text, Tooltip } from "@patternfly/react-core";
-import { List, ListItem } from "@patternfly/react-core";
-import { TimesCircleIcon } from "@patternfly/react-icons";
-import { WarningTriangleIcon } from "@patternfly/react-icons";
-import { InfoCircleIcon } from "@patternfly/react-icons";
+import { Label, List, ListItem, Text, Tooltip } from "@patternfly/react-core";
+import {
+  InfoCircleIcon,
+  TimesCircleIcon,
+  WarningTriangleIcon,
+} from "@patternfly/react-icons";
 import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
 import { Table, Tbody, Td, Th, Thead, Tr } from "@patternfly/react-table";
 
diff --git a/client/src/app/components/detail-drawer/review-fields.tsx b/client/src/app/components/detail-drawer/review-fields.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
 import {
   DescriptionListDescription,
@@ -11,8 +11,7 @@ import { EFFORT_ESTIMATE_LIST, PROPOSED_ACTION_LIST } from "@app/Constants";
 import { Application, Archetype, Review } from "@app/api/models";
 import { EmptyTextMessage } from "@app/components/EmptyTextMessage";
 import { useFetchArchetypes } from "@app/queries/archetypes";
-import { useFetchReviewById } from "@app/queries/reviews";
-import { useFetchReviews } from "@app/queries/reviews";
+import { useFetchReviewById, useFetchReviews } from "@app/queries/reviews";
 
 import { ReviewLabel } from "./review-label";
 
diff --git a/client/src/app/components/insights/tables/all-insights-table.tsx b/client/src/app/components/insights/tables/all-insights-table.tsx
@@ -12,8 +12,7 @@ import { Table, Tbody, Td, Th, Thead, Tr } from "@patternfly/react-table";
 
 import { TablePersistenceKeyPrefix, UI_UNIQUE_ID } from "@app/Constants";
 import { Paths } from "@app/Paths";
-import { UiAnalysisReportInsight } from "@app/api/models";
-import { HubRequestParams } from "@app/api/models";
+import { HubRequestParams, UiAnalysisReportInsight } from "@app/api/models";
 import { AppPlaceholder } from "@app/components/AppPlaceholder";
 import { FilterToolbar } from "@app/components/FilterToolbar";
 import { SimplePagination } from "@app/components/SimplePagination";
diff --git a/client/src/app/components/insights/tables/single-application-insights-table.tsx b/client/src/app/components/insights/tables/single-application-insights-table.tsx
@@ -19,9 +19,9 @@ import { Table, Tbody, Td, Th, Thead, Tr } from "@patternfly/react-table";
 import { TablePersistenceKeyPrefix, UI_UNIQUE_ID } from "@app/Constants";
 import {
   Application,
+  HubRequestParams,
   UiAnalysisReportApplicationInsight,
 } from "@app/api/models";
-import { HubRequestParams } from "@app/api/models";
 import { AppPlaceholder } from "@app/components/AppPlaceholder";
 import { ConditionalTooltip } from "@app/components/ConditionalTooltip";
 import { FilterToolbar } from "@app/components/FilterToolbar";
diff --git a/client/src/app/hooks/table-controls/filtering/useFilterState.ts b/client/src/app/hooks/table-controls/filtering/useFilterState.ts
@@ -6,8 +6,10 @@ import { DiscriminatedArgs } from "@app/utils/type-utils";
 
 import { IFeaturePersistenceArgs, isPersistenceProvider } from "../types";
 
-import { serializeFilterUrlParams } from "./helpers";
-import { deserializeFilterUrlParams } from "./helpers";
+import {
+  deserializeFilterUrlParams,
+  serializeFilterUrlParams,
+} from "./helpers";
 
 /**
  * The "source of truth" state for the filter feature.
diff --git a/client/src/app/hooks/useSelectionState/useSelectionState.test.ts b/client/src/app/hooks/useSelectionState/useSelectionState.test.ts
@@ -1,5 +1,4 @@
-import { act } from "@testing-library/react";
-import { renderHook } from "@testing-library/react";
+import { act, renderHook } from "@testing-library/react";
 
 import { useSelectionState } from "./useSelectionState";
 
diff --git a/client/src/app/pages/applications/analysis-wizard/__tests__/analysis-wizard.test.tsx b/client/src/app/pages/applications/analysis-wizard/__tests__/analysis-wizard.test.tsx
@@ -1,6 +1,4 @@
-import React from "react";
 import "@testing-library/jest-dom";
-import { server } from "@mocks/server";
 import userEvent from "@testing-library/user-event";
 import { rest } from "msw";
 
@@ -10,6 +8,7 @@ import {
   screen,
   waitFor,
 } from "@app/test-config/test-utils";
+import { server } from "@mocks/server";
 
 import { AnalysisWizard } from "../analysis-wizard";
 
diff --git a/client/src/app/pages/applications/application-detail-drawer/components/download-button.tsx b/client/src/app/pages/applications/application-detail-drawer/components/download-button.tsx
@@ -1,6 +1,5 @@
-import React from "react";
-import { Button } from "@patternfly/react-core";
-import { Alert, Spinner } from "@patternfly/react-core";
+import * as React from "react";
+import { Alert, Button, Spinner } from "@patternfly/react-core";
 import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
 
 import { Application, MimeType } from "@app/api/models";
diff --git a/client/src/app/pages/applications/application-form/__tests__/application-form.test.tsx b/client/src/app/pages/applications/application-form/__tests__/application-form.test.tsx
@@ -1,5 +1,3 @@
-import React from "react";
-import { server } from "@mocks/server";
 import userEvent from "@testing-library/user-event";
 import "@testing-library/jest-dom";
 import { rest } from "msw";
@@ -10,6 +8,7 @@ import {
   screen,
   waitFor,
 } from "@app/test-config/test-utils";
+import { server } from "@mocks/server";
 
 import { ApplicationFormModal } from "../application-form-modal";
 
diff --git a/client/src/app/pages/archetypes/components/archetype-form.tsx b/client/src/app/pages/archetypes/components/archetype-form.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from "react";
+import * as React from "react";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
@@ -14,10 +14,10 @@ import type { Archetype, New, Ref, TagRef } from "@app/api/models";
 import { AppPlaceholder } from "@app/components/AppPlaceholder";
 import { ConditionalRender } from "@app/components/ConditionalRender";
 import {
+  HookFormAutocomplete,
   HookFormPFTextArea,
   HookFormPFTextInput,
 } from "@app/components/HookFormPFFields";
-import { HookFormAutocomplete } from "@app/components/HookFormPFFields";
 import { useFetchArchetypes } from "@app/queries/archetypes";
 import { useFetchStakeholderGroups } from "@app/queries/stakeholdergroups";
 import { useFetchStakeholders } from "@app/queries/stakeholders";
@@ -83,11 +83,11 @@ const ArchetypeFormReady: React.FC<ArchetypeFormProps> = ({
     onActionSuccess: onClose,
   });
 
-  const manualTagRefs: TagRef[] = useMemo(() => {
+  const manualTagRefs: TagRef[] = React.useMemo(() => {
     return archetype?.tags?.filter((t) => !t?.source) ?? [];
   }, [archetype?.tags]);
 
-  const assessmentTagRefs: TagRef[] = useMemo(() => {
+  const assessmentTagRefs: TagRef[] = React.useMemo(() => {
     return archetype?.tags?.filter((t) => t?.source === "assessment") ?? [];
   }, [archetype?.tags]);
 
diff --git a/client/src/app/pages/asset-generators/asset-generators.tsx b/client/src/app/pages/asset-generators/asset-generators.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from "react";
+import { FC, useCallback, useState } from "react";
 import { AxiosError } from "axios";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
@@ -37,8 +37,10 @@ import {
   TableRowContentWithControls,
 } from "@app/components/TableControls";
 import { useLocalTableControls } from "@app/hooks/table-controls";
-import { useDeleteGeneratorMutation } from "@app/queries/generators";
-import { useFetchGenerators } from "@app/queries/generators";
+import {
+  useDeleteGeneratorMutation,
+  useFetchGenerators,
+} from "@app/queries/generators";
 import { getAxiosErrorMessage } from "@app/utils/utils";
 
 import GeneratorDetailDrawer from "./components/generator-detail-drawer";
@@ -56,7 +58,7 @@ const NO_DATA_EMPTY_STATE = (
   </EmptyState>
 );
 
-const AssetGenerators: React.FC = () => {
+const AssetGenerators: FC = () => {
   const { t } = useTranslation();
   const history = useHistory();
   const { pushNotification } = useNotifications();
diff --git a/client/src/app/pages/identities/components/identity-form/__tests__/identity-form.test.tsx b/client/src/app/pages/identities/components/identity-form/__tests__/identity-form.test.tsx
@@ -1,6 +1,4 @@
-import React from "react";
 import "@testing-library/jest-dom";
-import { server } from "@mocks/server";
 import { rest } from "msw";
 
 import {
@@ -9,6 +7,7 @@ import {
   screen,
   waitFor,
 } from "@app/test-config/test-utils";
+import { server } from "@mocks/server";
 
 import { IdentityForm } from "..";
 
diff --git a/client/src/app/pages/insights/file-incidents-detail-modal/incident-code-snip-viewer.tsx b/client/src/app/pages/insights/file-incidents-detail-modal/incident-code-snip-viewer.tsx
@@ -1,5 +1,4 @@
 import * as React from "react";
-import { LANGUAGES_BY_FILE_EXTENSION } from "config/monacoConstants";
 import { useTranslation } from "react-i18next";
 import { CodeEditor, Language } from "@patternfly/react-code-editor";
 import {
@@ -12,6 +11,7 @@ import {
 import { CubesIcon } from "@patternfly/react-icons";
 
 import { AnalysisIncident } from "@app/api/models";
+import { LANGUAGES_BY_FILE_EXTENSION } from "config/monacoConstants";
 
 import "./incident-code-snip-viewer.css";
 
diff --git a/client/src/app/pages/issues/file-incidents-detail-modal/incident-code-snip-viewer.tsx b/client/src/app/pages/issues/file-incidents-detail-modal/incident-code-snip-viewer.tsx
@@ -1,5 +1,4 @@
 import * as React from "react";
-import { LANGUAGES_BY_FILE_EXTENSION } from "config/monacoConstants";
 import { useTranslation } from "react-i18next";
 import { CodeEditor, Language } from "@patternfly/react-code-editor";
 import {
@@ -12,6 +11,7 @@ import {
 import { CubesIcon } from "@patternfly/react-icons";
 
 import { AnalysisIncident } from "@app/api/models";
+import { LANGUAGES_BY_FILE_EXTENSION } from "config/monacoConstants";
 
 import "./incident-code-snip-viewer.css";
 
diff --git a/client/src/app/pages/migration-targets/components/custom-target-form.tsx b/client/src/app/pages/migration-targets/components/custom-target-form.tsx
@@ -1,4 +1,5 @@
-import React, { useContext, useEffect, useMemo, useState } from "react";
+import * as React from "react";
+import { useContext, useEffect, useMemo, useState } from "react";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { AxiosError, AxiosResponse } from "axios";
 import { unique } from "radash";
@@ -29,15 +30,14 @@ import { UploadFileSchema } from "@app/pages/applications/analysis-wizard/schema
 import { useFetchIdentities } from "@app/queries/identities";
 import { useSettingMutation } from "@app/queries/settings";
 import {
+  useCreateFileMutation,
   useCreateTargetMutation,
   useFetchTargets,
   useUpdateTargetMutation,
 } from "@app/queries/targets";
-import { useCreateFileMutation } from "@app/queries/targets";
 import { toOptionLike, toRef } from "@app/utils/model-utils";
 import { getParsedLabel, parseRules } from "@app/utils/rules-utils";
-import { duplicateNameCheck } from "@app/utils/utils";
-import { getAxiosErrorMessage } from "@app/utils/utils";
+import { duplicateNameCheck, getAxiosErrorMessage } from "@app/utils/utils";
 
 import {
   DEFAULT_PROVIDER,
diff --git a/client/src/app/pages/proxies/__tests__/proxy-form.test.tsx b/client/src/app/pages/proxies/__tests__/proxy-form.test.tsx
@@ -1,6 +1,4 @@
-import React from "react";
 import "@testing-library/jest-dom";
-import { server } from "@mocks/server";
 import userEvent from "@testing-library/user-event";
 import { rest } from "msw";
 
@@ -10,6 +8,7 @@ import {
   screen,
   waitFor,
 } from "@app/test-config/test-utils";
+import { server } from "@mocks/server";
 
 import { Proxies } from "../proxies";
 
diff --git a/client/src/app/pages/review/components/review-form/review-form.tsx b/client/src/app/pages/review/components/review-form/review-form.tsx
@@ -1,10 +1,9 @@
-import React, { useMemo } from "react";
+import * as React from "react";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { FieldErrors, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
-import { mixed, object, string } from "yup";
-import { number } from "yup";
+import { mixed, number, object, string } from "yup";
 import {
   ActionGroup,
   Button,
@@ -59,14 +58,14 @@ export const ReviewForm: React.FC<IReviewFormProps> = ({
   const { pushNotification } = React.useContext(NotificationsContext);
   const isArchetype = useIsArchetype();
 
-  const actionOptions: OptionWithValue<ProposedAction>[] = useMemo(() => {
+  const actionOptions: OptionWithValue<ProposedAction>[] = React.useMemo(() => {
     return Object.entries(PROPOSED_ACTION_LIST).map(([key, value]) => ({
       value: key as ProposedAction,
       toString: () => t(value.i18Key),
     }));
   }, [t]);
 
-  const effortOptions: OptionWithValue<EffortEstimate>[] = useMemo(() => {
+  const effortOptions: OptionWithValue<EffortEstimate>[] = React.useMemo(() => {
     return Object.entries(EFFORT_ESTIMATE_LIST).map(([key, value]) => ({
       value: key as EffortEstimate,
       toString: () => t(value.i18Key),
diff --git a/client/src/app/pages/source-platforms/components/platform-form.tsx b/client/src/app/pages/source-platforms/components/platform-form.tsx
@@ -1,7 +1,7 @@
-import React from "react";
+import * as React from "react";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { AxiosError } from "axios";
-import { useForm } from "react-hook-form";
+import { useForm, useWatch } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import * as yup from "yup";
 import {
@@ -11,7 +11,7 @@ import {
   Form,
   Popover,
 } from "@patternfly/react-core";
-import HelpIcon from "@patternfly/react-icons/dist/esm/icons/help-icon";
+import { HelpIcon } from "@patternfly/react-icons/dist/esm/icons/help-icon";
 
 import { DEFAULT_SELECT_MAX_HEIGHT } from "@app/Constants";
 import type { New, SourcePlatform } from "@app/api/models";
@@ -22,8 +22,7 @@ import {
   HookFormPFTextInput,
 } from "@app/components/HookFormPFFields";
 import { NotificationsContext } from "@app/components/NotificationsContext";
-import { SimpleSelect } from "@app/components/SimpleSelect";
-import { OptionWithValue } from "@app/components/SimpleSelect";
+import { OptionWithValue, SimpleSelect } from "@app/components/SimpleSelect";
 import { usePlatformKindList } from "@app/hooks/usePlatformKindList";
 import { useFetchIdentities } from "@app/queries/identities";
 import {
@@ -117,7 +116,6 @@ const PlatformFormRenderer: React.FC<PlatformFormProps> = ({
     handleSubmit,
     formState: { isSubmitting, isValidating, isValid, isDirty },
     control,
-    watch,
   } = useForm<PlatformFormValues>({
     defaultValues: !platform
       ? {
@@ -138,7 +136,7 @@ const PlatformFormRenderer: React.FC<PlatformFormProps> = ({
     mode: "all",
   });
 
-  const selectedKind = watch("kind");
+  const selectedKind = useWatch({ name: "kind" });
 
   const getIdentity = (identityName: string | undefined) => {
     const temp = identities.find((identity) => identity.name === identityName);
diff --git a/cypress/package.json b/cypress/package.json
@@ -12,8 +12,8 @@
     "e2e:open:local": "dotenvx run -- cypress open --e2e",
     "e2e:run:minikube": "npm run e2e:run:local -- --config baseUrl=http://`minikube ip`",
     "e2e:open:minikube": "npm run e2e:open:local -- --config baseUrl=http://`minikube ip`",
-    "format": "prettier --ignore-path ../.gitignore --ignore-path ../.prettierignore --ignore-unknown --write .",
-    "format:check": "prettier --ignore-path ../.gitignore --ignore-path ../.prettierignore --ignore-unknown --check .",
+    "format": "prettier --ignore-path ../.gitignore --ignore-path ../.prettierignore --ignore-path .gitignore --ignore-unknown --write .",
+    "format:check": "prettier --ignore-path ../.gitignore --ignore-path ../.prettierignore --ignore-path .gitignore --ignore-unknown --check .",
     "lint": "eslint .",
     "lint:fix": "eslint --fix ."
   },
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* eslint-disable */`
`2`	`1`	`/* tslint:disable */`
`3`	`2`
`4`	`3`	`/**`