fix: merge conflicts from main

canonical · Jan 15, 2024 · c7c81de · c7c81de
1 parent dee6a8e
commit c7c81de
Show file tree

Hide file tree

Showing 93 changed files with 630 additions and 634 deletions.
diff --git a/src/app/base/components/ModelDeleteForm/ModelDeleteForm.test.tsx b/src/app/base/components/ModelDeleteForm/ModelDeleteForm.test.tsx
@@ -1,13 +1,13 @@
 import ModelDeleteForm from "./ModelDeleteForm";
 
-import { renderWithBrowserRouter, screen, userEvent } from "testing/utils";
+import { renderWithBrowserRouter, screen, userEvent } from "@/testing/utils";
 
 it("renders", () => {
   renderWithBrowserRouter(
     <ModelDeleteForm
       initialValues={{}}
       modelType="machine"
-      onSubmit={jest.fn()}
+      onSubmit={vi.fn()}
       submitLabel="Delete"
     />
   );
@@ -18,7 +18,7 @@ it("renders", () => {
 });
 
 it("can confirm", async () => {
-  const onSubmit = jest.fn();
+  const onSubmit = vi.fn();
   renderWithBrowserRouter(
     <ModelDeleteForm
       initialValues={{}}
@@ -33,14 +33,14 @@ it("can confirm", async () => {
 });
 
 it("can cancel", async () => {
-  const onCancel = jest.fn();
+  const onCancel = vi.fn();
   renderWithBrowserRouter(
     <ModelDeleteForm
       cancelLabel="Cancel"
       initialValues={{}}
       modelType="machine"
       onCancel={onCancel}
-      onSubmit={jest.fn()}
+      onSubmit={vi.fn()}
     />
   );
   const cancelBtn = screen.getByRole("button", { name: /cancel/i });

diff --git a/src/app/base/components/ModelDeleteForm/ModelDeleteForm.tsx b/src/app/base/components/ModelDeleteForm/ModelDeleteForm.tsx
@@ -1,8 +1,8 @@
 import { Col, Row } from "@canonical/react-components";
 
-import type { Props as FormikFormProps } from "app/base/components/FormikForm/FormikForm";
-import FormikForm from "app/base/components/FormikForm/FormikForm";
-import type { EmptyObject } from "app/base/types";
+import type { Props as FormikFormProps } from "@/app/base/components/FormikForm/FormikForm";
+import FormikForm from "@/app/base/components/FormikForm/FormikForm";
+import type { EmptyObject } from "@/app/base/types";
 
 type Props = {
   modelType: string;

diff --git a/src/app/base/components/NetworkActionRow/NetworkActionRow.tsx b/src/app/base/components/NetworkActionRow/NetworkActionRow.tsx
@@ -8,12 +8,12 @@ import { ExpandedState } from "../NodeNetworkTab/NodeNetworkTab";
 import type {
   Selected,
   SetSelected,
-} from "app/base/components/node/networking/types";
-import { useIsAllNetworkingDisabled } from "app/base/hooks";
-import { useSidePanel } from "app/base/side-panel-context";
-import { DeviceSidePanelViews } from "app/devices/constants";
-import { MachineSidePanelViews } from "app/machines/constants";
-import type { Node } from "app/store/types/node";
+} from "@/app/base/components/node/networking/types";
+import { useIsAllNetworkingDisabled } from "@/app/base/hooks";
+import { useSidePanel } from "@/app/base/side-panel-context";
+import { DeviceSidePanelViews } from "@/app/devices/constants";
+import { MachineSidePanelViews } from "@/app/machines/constants";
+import type { Node } from "@/app/store/types/node";
 
 type Action = {
   disabled: [boolean, string?][];

diff --git a/src/app/base/components/SSHKeyForm/SSHKeyFormFields/SSHKeyFormFields.tsx b/src/app/base/components/SSHKeyForm/SSHKeyFormFields/SSHKeyFormFields.tsx
@@ -4,9 +4,9 @@ import { useFormikContext } from "formik";
 
 import type { SSHKeyFormValues } from "../types";
 
-import FormikField from "app/base/components/FormikField";
-import TooltipButton from "app/base/components/TooltipButton";
-import docsUrls from "app/base/docsUrls";
+import FormikField from "@/app/base/components/FormikField";
+import TooltipButton from "@/app/base/components/TooltipButton";
+import docsUrls from "@/app/base/docsUrls";
 
 export const SSHKeyFormFields = (): JSX.Element => {
   const { values } = useFormikContext<SSHKeyFormValues>();

diff --git a/...base/components/node/StorageTables/AvailableStorageTable/BulkActions/BulkActions.test.tsx b/...base/components/node/StorageTables/AvailableStorageTable/BulkActions/BulkActions.test.tsx
@@ -2,9 +2,9 @@ import { vi } from "vitest";
 
 import BulkActions from "./BulkActions";
 
-import * as sidePanelHooks from "app/base/side-panel-context";
-import { MachineSidePanelViews } from "app/machines/constants";
-import { DiskTypes, StorageLayout } from "app/store/types/enum";
+import * as sidePanelHooks from "@/app/base/side-panel-context";
+import { MachineSidePanelViews } from "@/app/machines/constants";
+import { DiskTypes, StorageLayout } from "@/app/store/types/enum";
 import {
   machineDetails as machineDetailsFactory,
   machineState as machineStateFactory,
@@ -20,7 +20,7 @@ import {
   renderWithBrowserRouter,
   screen,
   userEvent,
-} from "testing/utils";
+} from "@/testing/utils";
 
 describe("BulkActions", () => {
   const setSidePanelContent = vi.fn();
@@ -211,7 +211,7 @@ describe("BulkActions", () => {
     renderWithBrowserRouter(
       <BulkActions
         selected={[selected]}
-        setBulkAction={jest.fn()}
+        setBulkAction={vi.fn()}
         systemId="abc123"
       />,
       { state }
@@ -255,7 +255,7 @@ describe("BulkActions", () => {
     renderWithBrowserRouter(
       <BulkActions
         selected={selected}
-        setBulkAction={jest.fn()}
+        setBulkAction={vi.fn()}
         systemId="abc123"
       />,
       { state }
@@ -297,7 +297,7 @@ describe("BulkActions", () => {
     renderWithBrowserRouter(
       <BulkActions
         selected={selected}
-        setBulkAction={jest.fn()}
+        setBulkAction={vi.fn()}
         systemId="abc123"
       />,
       { state }
@@ -336,7 +336,7 @@ describe("BulkActions", () => {
     renderWithBrowserRouter(
       <BulkActions
         selected={[selected]}
-        setBulkAction={jest.fn()}
+        setBulkAction={vi.fn()}
         systemId="abc123"
       />,
       { state }

diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/BulkActions.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/BulkActions.tsx
@@ -3,13 +3,13 @@ import { useSelector } from "react-redux";
 
 import { BulkAction } from "../AvailableStorageTable";
 
-import { useSidePanel } from "app/base/side-panel-context";
-import { MachineSidePanelViews } from "app/machines/constants";
-import machineSelectors from "app/store/machine/selectors";
-import type { Machine } from "app/store/machine/types";
-import { isMachineDetails } from "app/store/machine/utils";
-import type { RootState } from "app/store/root/types";
-import type { Disk, Partition } from "app/store/types/node";
+import { useSidePanel } from "@/app/base/side-panel-context";
+import { MachineSidePanelViews } from "@/app/machines/constants";
+import machineSelectors from "@/app/store/machine/selectors";
+import type { Machine } from "@/app/store/machine/types";
+import { isMachineDetails } from "@/app/store/machine/utils";
+import type { RootState } from "@/app/store/root/types";
+import type { Disk, Partition } from "@/app/store/types/node";
 import {
   canCreateOrUpdateDatastore,
   canCreateRaid,

diff --git a/.../node/StorageTables/AvailableStorageTable/BulkActions/CreateDatastore/CreateDatastore.tsx b/.../node/StorageTables/AvailableStorageTable/BulkActions/CreateDatastore/CreateDatastore.tsx
@@ -10,16 +10,16 @@ import {
 import { useDispatch, useSelector } from "react-redux";
 import * as Yup from "yup";
 
-import FormikField from "app/base/components/FormikField";
-import FormikForm from "app/base/components/FormikForm";
-import { useMachineDetailsForm } from "app/machines/hooks";
-import { actions as machineActions } from "app/store/machine";
-import machineSelectors from "app/store/machine/selectors";
-import type { Machine } from "app/store/machine/types";
-import type { MachineEventErrors } from "app/store/machine/types/base";
-import { isMachineDetails } from "app/store/machine/utils";
-import type { RootState } from "app/store/root/types";
-import type { Disk, Partition } from "app/store/types/node";
+import FormikField from "@/app/base/components/FormikField";
+import FormikForm from "@/app/base/components/FormikForm";
+import { useMachineDetailsForm } from "@/app/machines/hooks";
+import { actions as machineActions } from "@/app/store/machine";
+import machineSelectors from "@/app/store/machine/selectors";
+import type { Machine } from "@/app/store/machine/types";
+import type { MachineEventErrors } from "@/app/store/machine/types/base";
+import { isMachineDetails } from "@/app/store/machine/utils";
+import type { RootState } from "@/app/store/root/types";
+import type { Disk, Partition } from "@/app/store/types/node";
 import {
   formatSize,
   formatType,

diff --git a/...components/node/StorageTables/AvailableStorageTable/BulkActions/CreateRaid/CreateRaid.tsx b/...components/node/StorageTables/AvailableStorageTable/BulkActions/CreateRaid/CreateRaid.tsx
@@ -3,17 +3,17 @@ import * as Yup from "yup";
 
 import CreateRaidFields from "./CreateRaidFields";
 
-import FormikForm from "app/base/components/FormikForm";
-import { useMachineDetailsForm } from "app/machines/hooks";
-import { actions as machineActions } from "app/store/machine";
-import machineSelectors from "app/store/machine/selectors";
-import type { Machine } from "app/store/machine/types";
-import type { MachineEventErrors } from "app/store/machine/types/base";
-import { isMachineDetails } from "app/store/machine/utils";
-import type { RootState } from "app/store/root/types";
-import { DiskTypes } from "app/store/types/enum";
-import type { Disk, Partition } from "app/store/types/node";
-import { isRaid, splitDiskPartitionIds } from "app/store/utils";
+import FormikForm from "@/app/base/components/FormikForm";
+import { useMachineDetailsForm } from "@/app/machines/hooks";
+import { actions as machineActions } from "@/app/store/machine";
+import machineSelectors from "@/app/store/machine/selectors";
+import type { Machine } from "@/app/store/machine/types";
+import type { MachineEventErrors } from "@/app/store/machine/types/base";
+import { isMachineDetails } from "@/app/store/machine/utils";
+import type { RootState } from "@/app/store/root/types";
+import { DiskTypes } from "@/app/store/types/enum";
+import type { Disk, Partition } from "@/app/store/types/node";
+import { isRaid, splitDiskPartitionIds } from "@/app/store/utils";
 
 export type CreateRaidValues = {
   blockDeviceIds: number[];

diff --git a/...e/StorageTables/AvailableStorageTable/BulkActions/CreateVolumeGroup/CreateVolumeGroup.tsx b/...e/StorageTables/AvailableStorageTable/BulkActions/CreateVolumeGroup/CreateVolumeGroup.tsx
@@ -10,18 +10,22 @@ import {
 import { useDispatch, useSelector } from "react-redux";
 import * as Yup from "yup";
 
-import FormikField from "app/base/components/FormikField";
-import FormikForm from "app/base/components/FormikForm";
-import { useMachineDetailsForm } from "app/machines/hooks";
-import { actions as machineActions } from "app/store/machine";
-import machineSelectors from "app/store/machine/selectors";
-import type { Machine } from "app/store/machine/types";
-import type { MachineEventErrors } from "app/store/machine/types/base";
-import { isMachineDetails } from "app/store/machine/utils";
-import type { RootState } from "app/store/root/types";
-import { DiskTypes } from "app/store/types/enum";
-import type { Disk, Partition } from "app/store/types/node";
-import { formatSize, formatType, splitDiskPartitionIds } from "app/store/utils";
+import FormikField from "@/app/base/components/FormikField";
+import FormikForm from "@/app/base/components/FormikForm";
+import { useMachineDetailsForm } from "@/app/machines/hooks";
+import { actions as machineActions } from "@/app/store/machine";
+import machineSelectors from "@/app/store/machine/selectors";
+import type { Machine } from "@/app/store/machine/types";
+import type { MachineEventErrors } from "@/app/store/machine/types/base";
+import { isMachineDetails } from "@/app/store/machine/utils";
+import type { RootState } from "@/app/store/root/types";
+import { DiskTypes } from "@/app/store/types/enum";
+import type { Disk, Partition } from "@/app/store/types/node";
+import {
+  formatSize,
+  formatType,
+  splitDiskPartitionIds,
+} from "@/app/store/utils";
 
 type CreateVolumeGroupValues = {
   name: string;

diff --git a/.../node/StorageTables/AvailableStorageTable/BulkActions/UpdateDatastore/UpdateDatastore.tsx b/.../node/StorageTables/AvailableStorageTable/BulkActions/UpdateDatastore/UpdateDatastore.tsx
@@ -3,16 +3,16 @@ import * as Yup from "yup";
 
 import UpdateDatastoreFields from "./UpdateDatastoreFields";
 
-import FormikForm from "app/base/components/FormikForm";
-import { useMachineDetailsForm } from "app/machines/hooks";
-import { actions as machineActions } from "app/store/machine";
-import machineSelectors from "app/store/machine/selectors";
-import type { Machine } from "app/store/machine/types";
-import type { MachineEventErrors } from "app/store/machine/types/base";
-import { isMachineDetails } from "app/store/machine/utils";
-import type { RootState } from "app/store/root/types";
-import type { Disk, Partition } from "app/store/types/node";
-import { isDatastore, splitDiskPartitionIds } from "app/store/utils";
+import FormikForm from "@/app/base/components/FormikForm";
+import { useMachineDetailsForm } from "@/app/machines/hooks";
+import { actions as machineActions } from "@/app/store/machine";
+import machineSelectors from "@/app/store/machine/selectors";
+import type { Machine } from "@/app/store/machine/types";
+import type { MachineEventErrors } from "@/app/store/machine/types/base";
+import { isMachineDetails } from "@/app/store/machine/utils";
+import type { RootState } from "@/app/store/root/types";
+import type { Disk, Partition } from "@/app/store/types/node";
+import { isDatastore, splitDiskPartitionIds } from "@/app/store/utils";
 
 export type UpdateDatastoreValues = {
   datastore: number;

diff --git a/...ponents/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.tsx b/...ponents/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.tsx
@@ -2,13 +2,13 @@ import { Col, Row, Select } from "@canonical/react-components";
 import { useDispatch } from "react-redux";
 import * as Yup from "yup";
 
-import FormikField from "app/base/components/FormikField";
-import FormikForm from "app/base/components/FormikForm";
-import { useMachineDetailsForm } from "app/machines/hooks";
-import { actions as machineActions } from "app/store/machine";
-import type { MachineDetails } from "app/store/machine/types";
-import type { MachineEventErrors } from "app/store/machine/types/base";
-import { usesStorage } from "app/store/utils";
+import FormikField from "@/app/base/components/FormikField";
+import FormikForm from "@/app/base/components/FormikForm";
+import { useMachineDetailsForm } from "@/app/machines/hooks";
+import { actions as machineActions } from "@/app/store/machine";
+import type { MachineDetails } from "@/app/store/machine/types";
+import type { MachineEventErrors } from "@/app/store/machine/types/base";
+import { usesStorage } from "@/app/store/utils";
 
 const AddSpecialFilesystemSchema = Yup.object().shape({
   fstype: Yup.string().required(),

diff --git a/src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.tsx b/src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.tsx
@@ -4,14 +4,14 @@ import { Button, MainTable, Tooltip } from "@canonical/react-components";
 import type { MainTableRow } from "@canonical/react-components/dist/components/MainTable/MainTable";
 import { useDispatch } from "react-redux";
 
-import TableActionsDropdown from "app/base/components/TableActionsDropdown";
-import ActionConfirm from "app/base/components/node/ActionConfirm";
-import { useSidePanel } from "app/base/side-panel-context";
-import { MachineSidePanelViews } from "app/machines/constants";
-import type { ControllerDetails } from "app/store/controller/types";
-import { actions as machineActions } from "app/store/machine";
-import type { MachineDetails } from "app/store/machine/types";
-import type { Filesystem, Disk, Partition } from "app/store/types/node";
+import TableActionsDropdown from "@/app/base/components/TableActionsDropdown";
+import ActionConfirm from "@/app/base/components/node/ActionConfirm";
+import { useSidePanel } from "@/app/base/side-panel-context";
+import { MachineSidePanelViews } from "@/app/machines/constants";
+import type { ControllerDetails } from "@/app/store/controller/types";
+import { actions as machineActions } from "@/app/store/machine";
+import type { MachineDetails } from "@/app/store/machine/types";
+import type { Filesystem, Disk, Partition } from "@/app/store/types/node";
 import {
   formatSize,
   isMounted,

diff --git a/src/app/base/side-panel-context.tsx b/src/app/base/side-panel-context.tsx
@@ -12,13 +12,13 @@ import {
 import {
   DomainListSidePanelViews,
   type DomainListSidePanelContent,
-} from "app/domains/views/DomainsList/constants";
-import { ImageSidePanelViews } from "app/images/constants";
-import type { ImageSidePanelContent } from "app/images/types";
-import { KVMSidePanelViews } from "app/kvm/constants";
-import type { KVMSidePanelContent } from "app/kvm/types";
-import { MachineSidePanelViews } from "app/machines/constants";
-import type { MachineSidePanelContent } from "app/machines/types";
+} from "@/app/domains/views/DomainsList/constants";
+import { ImageSidePanelViews } from "@/app/images/constants";
+import type { ImageSidePanelContent } from "@/app/images/types";
+import { KVMSidePanelViews } from "@/app/kvm/constants";
+import type { KVMSidePanelContent } from "@/app/kvm/types";
+import { MachineSidePanelViews } from "@/app/machines/constants";
+import type { MachineSidePanelContent } from "@/app/machines/types";
 import {
   NetworkDiscoverySidePanelViews,
   type NetworkDiscoverySidePanelContent,

diff --git a/src/app/devices/components/DeviceNetworkForms/DeviceNetworkForms.test.tsx b/src/app/devices/components/DeviceNetworkForms/DeviceNetworkForms.test.tsx
@@ -2,15 +2,15 @@ import configureStore from "redux-mock-store";
 
 import DeviceNetworkForms from "./DeviceNetworkForms";
 
-import { DeviceSidePanelViews } from "app/devices/constants";
-import type { DeviceSidePanelContent } from "app/devices/types";
-import type { RootState } from "app/store/root/types";
+import { DeviceSidePanelViews } from "@/app/devices/constants";
+import type { DeviceSidePanelContent } from "@/app/devices/types";
+import type { RootState } from "@/app/store/root/types";
 import {
   deviceDetails as deviceDetailsFactory,
   deviceState as deviceStateFactory,
   rootState as rootStateFactory,
-} from "testing/factories";
-import { renderWithBrowserRouter, screen } from "testing/utils";
+} from "@/testing/factories";
+import { renderWithBrowserRouter, screen } from "@/testing/utils";
 
 const mockStore = configureStore<RootState>();
 let state: RootState;
@@ -30,7 +30,7 @@ it("renders a form when appropriate sidepanel view is provided", () => {
   };
   renderWithBrowserRouter(
     <DeviceNetworkForms
-      setSidePanelContent={jest.fn()}
+      setSidePanelContent={vi.fn()}
       sidePanelContent={sidePanelContent}
       systemId="abc123"
     />,

diff --git a/src/app/devices/components/DeviceNetworkForms/DeviceNetworkForms.tsx b/src/app/devices/components/DeviceNetworkForms/DeviceNetworkForms.tsx
@@ -1,11 +1,11 @@
 import { useCallback } from "react";
 
-import type { SidePanelContentTypes } from "app/base/side-panel-context";
-import { DeviceSidePanelViews } from "app/devices/constants";
-import AddInterface from "app/devices/views/DeviceDetails/DeviceNetwork/AddInterface";
-import RemoveInterface from "app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/RemoveInterface";
-import EditInterface from "app/devices/views/DeviceDetails/DeviceNetwork/EditInterface";
-import type { Device } from "app/store/device/types";
+import type { SidePanelContentTypes } from "@/app/base/side-panel-context";
+import { DeviceSidePanelViews } from "@/app/devices/constants";
+import AddInterface from "@/app/devices/views/DeviceDetails/DeviceNetwork/AddInterface";
+import RemoveInterface from "@/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/RemoveInterface";
+import EditInterface from "@/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface";
+import type { Device } from "@/app/store/device/types";
 
 type Props = SidePanelContentTypes & {
   systemId: Device["system_id"];