[PM-5189] Refactoring implementation

apps/browser/src/autofill/background/overlay.background.spec.ts

@@ -36,6 +36,11 @@ import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { DefaultBrowserStateService } from "../../platform/services/default-browser-state.service";
 import { BrowserPlatformUtilsService } from "../../platform/services/platform-utils/browser-platform-utils.service";
+import {
+  AutofillOverlayElement,
+  AutofillOverlayPort,
+  RedirectFocusDirection,
+} from "../enums/autofill-overlay.enum";
 import { AutofillService } from "../services/abstractions/autofill.service";
 import {
   createAutofillPageDetailsMock,
@@ -45,11 +50,6 @@ import {
   createPortSpyMock,
 } from "../spec/autofill-mocks";
 import { flushPromises, sendMockExtensionMessage, sendPortMessage } from "../spec/testing-utils";
-import {
-  AutofillOverlayElement,
-  AutofillOverlayPort,
-  RedirectFocusDirection,
-} from "../utils/autofill-overlay.enum";
 
 import OverlayBackground from "./overlay.background";
 

apps/browser/src/autofill/background/overlay.background.ts

@@ -26,9 +26,9 @@ import {
   openAddEditVaultItemPopout,
   openViewVaultItemPopout,
 } from "../../vault/popup/utils/vault-popout-window";
+import { AutofillOverlayElement, AutofillOverlayPort } from "../enums/autofill-overlay.enum";
 import { AutofillService } from "../services/abstractions/autofill.service";
 import { generateRandomChars } from "../utils";
-import { AutofillOverlayElement, AutofillOverlayPort } from "../utils/autofill-overlay.enum";
 
 import { LockedVaultPendingNotificationsData } from "./abstractions/notification.background";
 import {

apps/browser/src/autofill/overlay/content/autofill-overlay-inline-menu-elements.ts

@@ -1,10 +1,10 @@
 import { AutofillExtensionMessage } from "../../content/abstractions/autofill-init";
+import { AutofillOverlayElement } from "../../enums/autofill-overlay.enum";
 import {
   sendExtensionMessage,
   generateRandomCustomElementName,
   setElementStyles,
 } from "../../utils";
-import { AutofillOverlayElement } from "../../utils/autofill-overlay.enum";
 import {
   InlineMenuExtensionMessageHandlers,
   AutofillOverlayInlineMenuElements as InlineMenuElementsInterface,

apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-button-iframe.ts

@@ -1,4 +1,4 @@
-import { AutofillOverlayPort } from "../../utils/autofill-overlay.enum";
+import { AutofillOverlayPort } from "../../enums/autofill-overlay.enum";
 
 import AutofillOverlayIframeElement from "./autofill-overlay-iframe-element";
 

apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe-element.spec.ts

@@ -1,4 +1,4 @@
-import { AutofillOverlayPort } from "../../utils/autofill-overlay.enum";
+import { AutofillOverlayPort } from "../../enums/autofill-overlay.enum";
 
 import AutofillOverlayIframeElement from "./autofill-overlay-iframe-element";
 import AutofillOverlayIframeService from "./autofill-overlay-iframe.service";

apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe.service.spec.ts

@@ -3,13 +3,13 @@ import { mock } from "jest-mock-extended";
 import { EVENTS } from "@bitwarden/common/autofill/constants";
 import { ThemeType } from "@bitwarden/common/platform/enums";
 
+import { AutofillOverlayPort } from "../../enums/autofill-overlay.enum";
 import { createPortSpyMock } from "../../spec/autofill-mocks";
 import {
   flushPromises,
   sendPortMessage,
   triggerPortOnDisconnectEvent,
 } from "../../spec/testing-utils";
-import { AutofillOverlayPort } from "../../utils/autofill-overlay.enum";
 
 import AutofillOverlayIframeService from "./autofill-overlay-iframe.service";
 

apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-list-iframe.ts

@@ -1,4 +1,4 @@
-import { AutofillOverlayPort } from "../../utils/autofill-overlay.enum";
+import { AutofillOverlayPort } from "../../enums/autofill-overlay.enum";
 
 import AutofillOverlayIframeElement from "./autofill-overlay-iframe-element";
 

apps/browser/src/autofill/overlay/pages/button/bootstrap-autofill-overlay-button.ts

@@ -1,4 +1,4 @@
-import { AutofillOverlayElement } from "../../../utils/autofill-overlay.enum";
+import { AutofillOverlayElement } from "../../../enums/autofill-overlay.enum";
 
 import AutofillOverlayButton from "./autofill-overlay-button";
 

apps/browser/src/autofill/overlay/pages/list/bootstrap-autofill-overlay-list.ts

@@ -1,4 +1,4 @@
-import { AutofillOverlayElement } from "../../../utils/autofill-overlay.enum";
+import { AutofillOverlayElement } from "../../../enums/autofill-overlay.enum";
 
 import AutofillOverlayList from "./autofill-overlay-list";
 

apps/browser/src/autofill/overlay/pages/shared/autofill-overlay-page-element.ts

@@ -1,6 +1,6 @@
 import { EVENTS } from "@bitwarden/common/autofill/constants";
 
-import { RedirectFocusDirection } from "../../../utils/autofill-overlay.enum";
+import { RedirectFocusDirection } from "../../../enums/autofill-overlay.enum";
 import {
   AutofillOverlayPageElementWindowMessage,
   WindowMessageHandlers,

apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts

@@ -3,11 +3,11 @@ import { mock } from "jest-mock-extended";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { EVENTS, AutofillOverlayVisibility } from "@bitwarden/common/autofill/constants";
 
+import { AutofillOverlayElement, RedirectFocusDirection } from "../enums/autofill-overlay.enum";
 import AutofillField from "../models/autofill-field";
 import { createAutofillFieldMock } from "../spec/autofill-mocks";
 import { flushPromises } from "../spec/testing-utils";
 import { ElementWithOpId, FormFieldElement } from "../types";
-import { AutofillOverlayElement, RedirectFocusDirection } from "../utils/autofill-overlay.enum";
 
 import { AutoFillConstants } from "./autofill-constants";
 import AutofillOverlayContentService from "./autofill-overlay-content.service";

apps/browser/src/autofill/services/autofill-overlay-content.service.ts

@@ -10,10 +10,10 @@ import {
   SubFrameOffsetData,
 } from "../background/abstractions/overlay.background";
 import { AutofillExtensionMessage } from "../content/abstractions/autofill-init";
+import { AutofillOverlayElement, RedirectFocusDirection } from "../enums/autofill-overlay.enum";
 import AutofillField from "../models/autofill-field";
 import { ElementWithOpId, FillableFormFieldElement, FormFieldElement } from "../types";
 import { elementIsFillableFormField, getAttributeBoolean, sendExtensionMessage } from "../utils";
-import { AutofillOverlayElement, RedirectFocusDirection } from "../utils/autofill-overlay.enum";
 
 import {
   AutofillOverlayContentExtensionMessageHandlers,

apps/browser/src/autofill/services/autofill.service.spec.ts

@@ -32,7 +32,7 @@ import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
 import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
-import { AutofillPort } from "../enums/autofill-port.enums";
+import { AutofillPort } from "../enums/autofill-port.enum";
 import AutofillField from "../models/autofill-field";
 import AutofillPageDetails from "../models/autofill-page-details";
 import AutofillScript from "../models/autofill-script";

apps/browser/src/autofill/services/autofill.service.ts

@@ -21,7 +21,7 @@ import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { openVaultItemPasswordRepromptPopout } from "../../vault/popup/utils/vault-popout-window";
-import { AutofillPort } from "../enums/autofill-port.enums";
+import { AutofillPort } from "../enums/autofill-port.enum";
 import AutofillField from "../models/autofill-field";
 import AutofillPageDetails from "../models/autofill-page-details";
 import AutofillScript from "../models/autofill-script";

apps/browser/src/autofill/utils/index.spec.ts

@@ -1,4 +1,4 @@
-import { AutofillPort } from "../enums/autofill-port.enums";
+import { AutofillPort } from "../enums/autofill-port.enum";
 import { triggerPortOnDisconnectEvent } from "../spec/testing-utils";
 
 import { logoIcon, logoLockedIcon } from "./svg-icons";

apps/browser/src/autofill/utils/index.ts

@@ -1,4 +1,4 @@
-import { AutofillPort } from "../enums/autofill-port.enums";
+import { AutofillPort } from "../enums/autofill-port.enum";
 import { FillableFormFieldElement, FormElementWithAttribute, FormFieldElement } from "../types";
 
 export function generateRandomChars(length: number): string {