diff --git a/src/app/App.test.tsx b/src/app/App.test.tsx index 96cd1582abe..309d9cb677f 100644 --- a/src/app/App.test.tsx +++ b/src/app/App.test.tsx @@ -5,7 +5,7 @@ import { App } from "./App"; import { ConfigNames } from "@/app/store/config/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as statusActions } from "@/app/store/status"; +import { statusActions } from "@/app/store/status"; import * as factory from "@/testing/factories"; import { screen, renderWithBrowserRouter } from "@/testing/utils"; diff --git a/src/app/App.tsx b/src/app/App.tsx index 30005944e48..315db92551d 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -20,12 +20,12 @@ import Login from "@/app/base/components/Login"; import StatusBar from "@/app/base/components/StatusBar"; import FileContext, { fileContextStore } from "@/app/base/file-context"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as authActions } from "@/app/store/auth"; +import { authActions } from "@/app/store/auth"; import authSelectors from "@/app/store/auth/selectors"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; -import { actions as generalActions } from "@/app/store/general"; -import { actions as statusActions } from "@/app/store/status"; +import { generalActions } from "@/app/store/general"; +import { statusActions } from "@/app/store/status"; import status from "@/app/store/status/selectors"; export enum VaultErrors { diff --git a/src/app/base/components/AppSideNavigation/AppSideNavigation.test.tsx b/src/app/base/components/AppSideNavigation/AppSideNavigation.test.tsx index 4bb7433b874..c1db839e2c1 100644 --- a/src/app/base/components/AppSideNavigation/AppSideNavigation.test.tsx +++ b/src/app/base/components/AppSideNavigation/AppSideNavigation.test.tsx @@ -9,7 +9,7 @@ import AppSideNavigation from "./AppSideNavigation"; import urls from "@/app/base/urls"; import { ConfigNames } from "@/app/store/config/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as statusActions } from "@/app/store/status"; +import { statusActions } from "@/app/store/status"; import * as factory from "@/testing/factories"; import { userEvent, diff --git a/src/app/base/components/AppSideNavigation/AppSideNavigation.tsx b/src/app/base/components/AppSideNavigation/AppSideNavigation.tsx index 016183d43bf..33ebdd5027c 100644 --- a/src/app/base/components/AppSideNavigation/AppSideNavigation.tsx +++ b/src/app/base/components/AppSideNavigation/AppSideNavigation.tsx @@ -20,12 +20,12 @@ import { useThemeContext } from "@/app/base/theme-context"; import urls from "@/app/base/urls"; import authSelectors from "@/app/store/auth/selectors"; import configSelectors from "@/app/store/config/selectors"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import podSelectors from "@/app/store/pod/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as statusActions } from "@/app/store/status"; +import { statusActions } from "@/app/store/status"; export type SideNavigationProps = { authUser: ReturnType; diff --git a/src/app/base/components/ArchitectureSelect/ArchitectureSelect.tsx b/src/app/base/components/ArchitectureSelect/ArchitectureSelect.tsx index 4ecc29e43a1..d8342197699 100644 --- a/src/app/base/components/ArchitectureSelect/ArchitectureSelect.tsx +++ b/src/app/base/components/ArchitectureSelect/ArchitectureSelect.tsx @@ -5,7 +5,7 @@ import { useSelector } from "react-redux"; import FormikField from "@/app/base/components/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { architectures as architecturesSelectors } from "@/app/store/general/selectors"; type Props = { diff --git a/src/app/base/components/ControllerLink/ControllerLink.tsx b/src/app/base/components/ControllerLink/ControllerLink.tsx index fe2c7d0fba3..3c6cf0abd4a 100644 --- a/src/app/base/components/ControllerLink/ControllerLink.tsx +++ b/src/app/base/components/ControllerLink/ControllerLink.tsx @@ -4,7 +4,7 @@ import { Link } from "react-router-dom-v5-compat"; import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import type { Controller, ControllerMeta } from "@/app/store/controller/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/base/components/DHCPTable/DHCPTable.tsx b/src/app/base/components/DHCPTable/DHCPTable.tsx index 6556b7d3b9b..21d67c32bc5 100644 --- a/src/app/base/components/DHCPTable/DHCPTable.tsx +++ b/src/app/base/components/DHCPTable/DHCPTable.tsx @@ -14,7 +14,7 @@ import TableActions from "@/app/base/components/TableActions"; import docsUrls from "@/app/base/docsUrls"; import { useFetchActions } from "@/app/base/hooks"; import settingsURLs from "@/app/settings/urls"; -import { actions as dhcpsnippetActions } from "@/app/store/dhcpsnippet"; +import { dhcpsnippetActions } from "@/app/store/dhcpsnippet"; import dhcpsnippetSelectors from "@/app/store/dhcpsnippet/selectors"; import type { DHCPSnippet } from "@/app/store/dhcpsnippet/types"; import type { IPRange } from "@/app/store/iprange/types"; diff --git a/src/app/base/components/DeviceLink/DeviceLink.tsx b/src/app/base/components/DeviceLink/DeviceLink.tsx index d9cea000342..02e3206ad26 100644 --- a/src/app/base/components/DeviceLink/DeviceLink.tsx +++ b/src/app/base/components/DeviceLink/DeviceLink.tsx @@ -4,7 +4,7 @@ import { Link } from "react-router-dom-v5-compat"; import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { Device, DeviceMeta } from "@/app/store/device/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/base/components/DhcpForm/DhcpForm.test.tsx b/src/app/base/components/DhcpForm/DhcpForm.test.tsx index 8eb5c80e3ca..c38e9f16e82 100644 --- a/src/app/base/components/DhcpForm/DhcpForm.test.tsx +++ b/src/app/base/components/DhcpForm/DhcpForm.test.tsx @@ -7,7 +7,7 @@ import { Labels as FieldLabels } from "../DhcpFormFields"; import DhcpForm, { Labels } from "./DhcpForm"; -import { actions as dhcpActions } from "@/app/store/dhcpsnippet"; +import { dhcpsnippetActions } from "@/app/store/dhcpsnippet"; import dhcpsnippetSelectors from "@/app/store/dhcpsnippet/selectors"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; @@ -59,7 +59,7 @@ describe("DhcpForm", () => { unmount(); - const expectedAction = dhcpActions.cleanup(); + const expectedAction = dhcpsnippetActions.cleanup(); expect( store.getActions().find((action) => action.type === expectedAction.type) ).toStrictEqual(expectedAction); @@ -87,7 +87,7 @@ describe("DhcpForm", () => { ); await userEvent.click(screen.getByRole("button", { name: Labels.Submit })); - const expectedAction = dhcpActions.update({ + const expectedAction = dhcpsnippetActions.update({ description: dhcpSnippet.description, enabled: dhcpSnippet.enabled, id: dhcpSnippet.id, @@ -128,7 +128,7 @@ describe("DhcpForm", () => { ); await userEvent.click(screen.getByRole("button", { name: Labels.Submit })); - const expectedAction = dhcpActions.create({ + const expectedAction = dhcpsnippetActions.create({ description: "new-description", enabled: true, name: "new-lease", diff --git a/src/app/base/components/DhcpForm/DhcpForm.tsx b/src/app/base/components/DhcpForm/DhcpForm.tsx index 0d7db718291..7cfc186949f 100644 --- a/src/app/base/components/DhcpForm/DhcpForm.tsx +++ b/src/app/base/components/DhcpForm/DhcpForm.tsx @@ -11,16 +11,16 @@ import FormikForm from "@/app/base/components/FormikForm"; import type { Props as FormikFormProps } from "@/app/base/components/FormikForm/FormikForm"; import { useFetchActions, useAddMessage } from "@/app/base/hooks"; import { useDhcpTarget } from "@/app/settings/hooks"; -import { actions as controllerActions } from "@/app/store/controller"; -import { actions as deviceActions } from "@/app/store/device"; -import { actions as dhcpsnippetActions } from "@/app/store/dhcpsnippet"; +import { controllerActions } from "@/app/store/controller"; +import { deviceActions } from "@/app/store/device"; +import { dhcpsnippetActions } from "@/app/store/dhcpsnippet"; import dhcpsnippetSelectors from "@/app/store/dhcpsnippet/selectors"; import type { DHCPSnippet } from "@/app/store/dhcpsnippet/types"; -import { actions as ipRangeActions } from "@/app/store/iprange"; +import { ipRangeActions } from "@/app/store/iprange"; import ipRangeSelectors from "@/app/store/iprange/selectors"; import { useFetchMachines } from "@/app/store/machine/utils/hooks"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; const DhcpSchema = Yup.object() .shape({ diff --git a/src/app/base/components/DhcpFormFields/MachineSelect/MachineSelect.tsx b/src/app/base/components/DhcpFormFields/MachineSelect/MachineSelect.tsx index 3f68b4d586a..e45eefeb314 100644 --- a/src/app/base/components/DhcpFormFields/MachineSelect/MachineSelect.tsx +++ b/src/app/base/components/DhcpFormFields/MachineSelect/MachineSelect.tsx @@ -14,7 +14,7 @@ import OutsideClickHandler from "@/app/base/components/OutsideClickHandler"; import { useFetchActions, usePreviousPersistent } from "@/app/base/hooks"; import type { FetchFilters, Machine } from "@/app/store/machine/types"; import { useFetchMachine } from "@/app/store/machine/utils/hooks"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; export enum Labels { AppliesTo = "Applies to", diff --git a/src/app/base/components/DhcpFormFields/MachineSelect/MachineSelectBox/MachineSelectBox.test.tsx b/src/app/base/components/DhcpFormFields/MachineSelect/MachineSelectBox/MachineSelectBox.test.tsx index 15a16d10e6d..e2e8d8694fd 100644 --- a/src/app/base/components/DhcpFormFields/MachineSelect/MachineSelectBox/MachineSelectBox.test.tsx +++ b/src/app/base/components/DhcpFormFields/MachineSelect/MachineSelectBox/MachineSelectBox.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import MachineSelectBox from "./MachineSelectBox"; import { DEFAULT_DEBOUNCE_INTERVAL } from "@/app/base/components/DebounceSearchBox/DebounceSearchBox"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/base/components/DomainSelect/DomainSelect.tsx b/src/app/base/components/DomainSelect/DomainSelect.tsx index ce7fa78bdc3..8b9a126de35 100644 --- a/src/app/base/components/DomainSelect/DomainSelect.tsx +++ b/src/app/base/components/DomainSelect/DomainSelect.tsx @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import FormikField from "@/app/base/components/FormikField"; import type { Props as FormikFieldProps } from "@/app/base/components/FormikField/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; type Props = { diff --git a/src/app/base/components/FabricLink/FabricLink.tsx b/src/app/base/components/FabricLink/FabricLink.tsx index 3ff988f718a..82f62aff41f 100644 --- a/src/app/base/components/FabricLink/FabricLink.tsx +++ b/src/app/base/components/FabricLink/FabricLink.tsx @@ -4,7 +4,7 @@ import { Link } from "react-router-dom-v5-compat"; import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { Fabric, FabricMeta } from "@/app/store/fabric/types"; import { getFabricDisplay } from "@/app/store/fabric/utils"; diff --git a/src/app/base/components/FabricSelect/FabricSelect.tsx b/src/app/base/components/FabricSelect/FabricSelect.tsx index 5c8cf7b8e46..2465298eef5 100644 --- a/src/app/base/components/FabricSelect/FabricSelect.tsx +++ b/src/app/base/components/FabricSelect/FabricSelect.tsx @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from "react-redux"; import DynamicSelect from "@/app/base/components/DynamicSelect"; import type { Props as FormikFieldProps } from "@/app/base/components/FormikField/FormikField"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import { simpleSortByKey } from "@/app/utils"; diff --git a/src/app/base/components/Login/Login.test.tsx b/src/app/base/components/Login/Login.test.tsx index 7221457bcf7..8fc891ff14c 100644 --- a/src/app/base/components/Login/Login.test.tsx +++ b/src/app/base/components/Login/Login.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import Login, { Labels } from "./Login"; import type { RootState } from "@/app/store/root/types"; -import { actions as statusActions } from "@/app/store/status"; +import { statusActions } from "@/app/store/status"; import * as factory from "@/testing/factories"; import { userEvent, screen, renderWithBrowserRouter } from "@/testing/utils"; diff --git a/src/app/base/components/Login/Login.tsx b/src/app/base/components/Login/Login.tsx index d7fe620751f..0283e38be43 100644 --- a/src/app/base/components/Login/Login.tsx +++ b/src/app/base/components/Login/Login.tsx @@ -15,7 +15,7 @@ import * as Yup from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as statusActions } from "@/app/store/status"; +import { statusActions } from "@/app/store/status"; import statusSelectors from "@/app/store/status/selectors"; import { formatErrors } from "@/app/utils"; diff --git a/src/app/base/components/MachineSelectTable/MachineSelectTable.tsx b/src/app/base/components/MachineSelectTable/MachineSelectTable.tsx index 0cf268bcca9..983dd491fb5 100644 --- a/src/app/base/components/MachineSelectTable/MachineSelectTable.tsx +++ b/src/app/base/components/MachineSelectTable/MachineSelectTable.tsx @@ -11,7 +11,7 @@ import DoubleRow from "@/app/base/components/DoubleRow"; import { useFetchActions } from "@/app/base/hooks"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import type { Tag } from "@/app/store/tag/types"; import { getTagNamesForIds } from "@/app/store/tag/utils"; diff --git a/src/app/base/components/MinimumKernelSelect/MinimumKernelSelect.tsx b/src/app/base/components/MinimumKernelSelect/MinimumKernelSelect.tsx index 22007c3875e..938203d377f 100644 --- a/src/app/base/components/MinimumKernelSelect/MinimumKernelSelect.tsx +++ b/src/app/base/components/MinimumKernelSelect/MinimumKernelSelect.tsx @@ -5,7 +5,7 @@ import { useSelector } from "react-redux"; import FormikField from "@/app/base/components/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { hweKernels as hweKernelsSelectors } from "@/app/store/general/selectors"; type Props = { diff --git a/src/app/base/components/NodeSummaryNetworkCard/NodeSummaryNetworkCard.tsx b/src/app/base/components/NodeSummaryNetworkCard/NodeSummaryNetworkCard.tsx index 1a5a91587b5..9ba61633ad9 100644 --- a/src/app/base/components/NodeSummaryNetworkCard/NodeSummaryNetworkCard.tsx +++ b/src/app/base/components/NodeSummaryNetworkCard/NodeSummaryNetworkCard.tsx @@ -9,11 +9,11 @@ import NetworkCardTable from "./NetworkCardTable"; import { useFetchActions } from "@/app/base/hooks"; import type { Device } from "@/app/store/device/types"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { MachineDetails } from "@/app/store/machine/types"; import type { NetworkInterface } from "@/app/store/types/node"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; type InterfaceGroup = { diff --git a/src/app/base/components/NotificationGroup/Notification/Notification.tsx b/src/app/base/components/NotificationGroup/Notification/Notification.tsx index f06a3ec118c..2e85c7f95df 100644 --- a/src/app/base/components/NotificationGroup/Notification/Notification.tsx +++ b/src/app/base/components/NotificationGroup/Notification/Notification.tsx @@ -5,7 +5,7 @@ import { useNavigate } from "react-router-dom-v5-compat"; import settingsURLs from "@/app/settings/urls"; import authSelectors from "@/app/store/auth/selectors"; -import { actions as notificationActions } from "@/app/store/notification"; +import { notificationActions } from "@/app/store/notification"; import notificationSelectors from "@/app/store/notification/selectors"; import type { Notification as NotificationType } from "@/app/store/notification/types"; import { diff --git a/src/app/base/components/NotificationGroup/NotificationGroup.tsx b/src/app/base/components/NotificationGroup/NotificationGroup.tsx index f8f470b71f9..a351c9a4a17 100644 --- a/src/app/base/components/NotificationGroup/NotificationGroup.tsx +++ b/src/app/base/components/NotificationGroup/NotificationGroup.tsx @@ -9,7 +9,7 @@ import type { Dispatch } from "redux"; import NotificationGroupNotification from "./Notification"; -import { actions as notificationActions } from "@/app/store/notification"; +import { notificationActions } from "@/app/store/notification"; import type { Notification as NotificationType } from "@/app/store/notification/types"; import { capitaliseFirst } from "@/app/utils"; diff --git a/src/app/base/components/NotificationList/NotificationList.tsx b/src/app/base/components/NotificationList/NotificationList.tsx index 1d5bc4edeae..bcd8baed4d7 100644 --- a/src/app/base/components/NotificationList/NotificationList.tsx +++ b/src/app/base/components/NotificationList/NotificationList.tsx @@ -8,10 +8,10 @@ import { useDispatch, useSelector } from "react-redux"; import NotificationGroup from "@/app/base/components/NotificationGroup"; import NotificationGroupNotification from "@/app/base/components/NotificationGroup/Notification"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as messageActions } from "@/app/store/message"; +import { messageActions } from "@/app/store/message"; import messageSelectors from "@/app/store/message/selectors"; import type { Message } from "@/app/store/message/types"; -import { actions as notificationActions } from "@/app/store/notification"; +import { notificationActions } from "@/app/store/notification"; import notificationSelectors from "@/app/store/notification/selectors"; const Messages = ({ messages }: { messages: Message[] }) => { diff --git a/src/app/base/components/PowerTypeFields/PowerTypeFields.tsx b/src/app/base/components/PowerTypeFields/PowerTypeFields.tsx index 36a85ebf448..d40db4dce1c 100644 --- a/src/app/base/components/PowerTypeFields/PowerTypeFields.tsx +++ b/src/app/base/components/PowerTypeFields/PowerTypeFields.tsx @@ -12,7 +12,7 @@ import LXDPowerFields from "./LXDPowerFields"; import FormikField from "@/app/base/components/FormikField"; import { useFetchActions } from "@/app/base/hooks"; import type { AnyObject } from "@/app/base/types"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { PowerTypeNames } from "@/app/store/general/constants"; import { powerTypes as powerTypesSelectors } from "@/app/store/general/selectors"; import { PowerFieldScope } from "@/app/store/general/types"; diff --git a/src/app/base/components/ResourcePoolSelect/ResourcePoolSelect.tsx b/src/app/base/components/ResourcePoolSelect/ResourcePoolSelect.tsx index 957b00b10d0..6323c3c316b 100644 --- a/src/app/base/components/ResourcePoolSelect/ResourcePoolSelect.tsx +++ b/src/app/base/components/ResourcePoolSelect/ResourcePoolSelect.tsx @@ -5,7 +5,7 @@ import { useSelector } from "react-redux"; import FormikField from "@/app/base/components/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; type Props = { diff --git a/src/app/base/components/SSHKeyForm/SSHKeyForm.tsx b/src/app/base/components/SSHKeyForm/SSHKeyForm.tsx index c1bfd406c92..2367fbfddf8 100644 --- a/src/app/base/components/SSHKeyForm/SSHKeyForm.tsx +++ b/src/app/base/components/SSHKeyForm/SSHKeyForm.tsx @@ -9,7 +9,7 @@ import type { SSHKeyFormValues } from "./types"; import FormikForm from "@/app/base/components/FormikForm"; import type { Props as FormikFormProps } from "@/app/base/components/FormikForm/FormikForm"; import { useAddMessage } from "@/app/base/hooks"; -import { actions as sshkeyActions } from "@/app/store/sshkey"; +import { sshkeyActions } from "@/app/store/sshkey"; import sshkeySelectors from "@/app/store/sshkey/selectors"; const SSHKeySchema = Yup.object().shape({ diff --git a/src/app/base/components/SSHKeyList/SSHKeyList.tsx b/src/app/base/components/SSHKeyList/SSHKeyList.tsx index 17fed08ad3e..10153a485ba 100644 --- a/src/app/base/components/SSHKeyList/SSHKeyList.tsx +++ b/src/app/base/components/SSHKeyList/SSHKeyList.tsx @@ -9,7 +9,7 @@ import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/preferences/urls"; import SettingsTable from "@/app/settings/components/SettingsTable"; import type { Props as SettingsTableProps } from "@/app/settings/components/SettingsTable/SettingsTable"; -import { actions as sshkeyActions } from "@/app/store/sshkey"; +import { sshkeyActions } from "@/app/store/sshkey"; import sshkeySelectors from "@/app/store/sshkey/selectors"; import type { KeySource, SSHKey } from "@/app/store/sshkey/types"; diff --git a/src/app/base/components/SpaceLink/SpaceLink.tsx b/src/app/base/components/SpaceLink/SpaceLink.tsx index 2e4d5cd82d8..155519c9f0e 100644 --- a/src/app/base/components/SpaceLink/SpaceLink.tsx +++ b/src/app/base/components/SpaceLink/SpaceLink.tsx @@ -5,7 +5,7 @@ import { Link } from "react-router-dom-v5-compat"; import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import spaceSelectors from "@/app/store/space/selectors"; import type { Space, SpaceMeta } from "@/app/store/space/types"; import { getSpaceDisplay } from "@/app/store/space/utils"; diff --git a/src/app/base/components/SpaceSelect/SpaceSelect.tsx b/src/app/base/components/SpaceSelect/SpaceSelect.tsx index 3a75e262e39..25237b3062d 100644 --- a/src/app/base/components/SpaceSelect/SpaceSelect.tsx +++ b/src/app/base/components/SpaceSelect/SpaceSelect.tsx @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import FormikField from "@/app/base/components/FormikField"; import type { Props as FormikFieldProps } from "@/app/base/components/FormikField/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import spaceSelectors from "@/app/store/space/selectors"; import { simpleSortByKey } from "@/app/utils"; diff --git a/src/app/base/components/SubnetLink/SubnetLink.tsx b/src/app/base/components/SubnetLink/SubnetLink.tsx index d92d40e67fd..150bd75397c 100644 --- a/src/app/base/components/SubnetLink/SubnetLink.tsx +++ b/src/app/base/components/SubnetLink/SubnetLink.tsx @@ -5,7 +5,7 @@ import { Link } from "react-router-dom-v5-compat"; import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet, SubnetMeta } from "@/app/store/subnet/types"; import { getSubnetDisplay } from "@/app/store/subnet/utils"; diff --git a/src/app/base/components/SubnetSelect/SubnetSelect.tsx b/src/app/base/components/SubnetSelect/SubnetSelect.tsx index 0228f70a7d8..9e1a907ce13 100644 --- a/src/app/base/components/SubnetSelect/SubnetSelect.tsx +++ b/src/app/base/components/SubnetSelect/SubnetSelect.tsx @@ -5,7 +5,7 @@ import { useSelector } from "react-redux"; import DynamicSelect from "@/app/base/components/DynamicSelect"; import type { Props as FormikFieldProps } from "@/app/base/components/FormikField/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; import { getSubnetDisplay } from "@/app/store/subnet/utils"; diff --git a/src/app/base/components/VLANLink/VLANLink.tsx b/src/app/base/components/VLANLink/VLANLink.tsx index e3079548ffe..a30b74fcab6 100644 --- a/src/app/base/components/VLANLink/VLANLink.tsx +++ b/src/app/base/components/VLANLink/VLANLink.tsx @@ -5,7 +5,7 @@ import { Link } from "react-router-dom-v5-compat"; import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import type { VLAN, VLANMeta } from "@/app/store/vlan/types"; import { getVLANDisplay } from "@/app/store/vlan/utils"; diff --git a/src/app/base/components/VLANSelect/VLANSelect.tsx b/src/app/base/components/VLANSelect/VLANSelect.tsx index 820e6511ad4..62f1d646050 100644 --- a/src/app/base/components/VLANSelect/VLANSelect.tsx +++ b/src/app/base/components/VLANSelect/VLANSelect.tsx @@ -9,7 +9,7 @@ import DynamicSelect from "@/app/base/components/DynamicSelect"; import type { Props as FormikFieldProps } from "@/app/base/components/FormikField/FormikField"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import { VlanVid } from "@/app/store/vlan/types"; import type { VLAN } from "@/app/store/vlan/types"; diff --git a/src/app/base/components/ZoneSelect/ZoneSelect.tsx b/src/app/base/components/ZoneSelect/ZoneSelect.tsx index cbef0567149..046e837b61f 100644 --- a/src/app/base/components/ZoneSelect/ZoneSelect.tsx +++ b/src/app/base/components/ZoneSelect/ZoneSelect.tsx @@ -5,7 +5,7 @@ import { useSelector } from "react-redux"; import FormikField from "@/app/base/components/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; import type { Zone } from "@/app/store/zone/types"; diff --git a/src/app/base/components/node/FieldlessForm/FieldlessForm.test.tsx b/src/app/base/components/node/FieldlessForm/FieldlessForm.test.tsx index 31073622f4e..b700c99dfcf 100644 --- a/src/app/base/components/node/FieldlessForm/FieldlessForm.test.tsx +++ b/src/app/base/components/node/FieldlessForm/FieldlessForm.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import FieldlessForm from "./FieldlessForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import { NodeActions } from "@/app/store/types/node"; import * as factory from "@/testing/factories"; diff --git a/src/app/base/components/node/FieldlessForm/FieldlessForm.tsx b/src/app/base/components/node/FieldlessForm/FieldlessForm.tsx index 5d8822e2cea..688e46d6830 100644 --- a/src/app/base/components/node/FieldlessForm/FieldlessForm.tsx +++ b/src/app/base/components/node/FieldlessForm/FieldlessForm.tsx @@ -6,8 +6,8 @@ import type { NodeActionFormProps } from "../types"; import ActionForm from "@/app/base/components/ActionForm"; import type { EmptyObject } from "@/app/base/types"; -import type { actions as controllerActions } from "@/app/store/controller"; -import type { actions as machineActions } from "@/app/store/machine"; +import type { controllerActions } from "@/app/store/controller"; +import type { machineActions } from "@/app/store/machine"; import { useSelectedMachinesActionsDispatch } from "@/app/store/machine/utils/hooks"; import type { NodeActions } from "@/app/store/types/node"; import { getNodeActionTitle } from "@/app/store/utils"; diff --git a/src/app/base/components/node/MachinesHeader/MachinesHeader.tsx b/src/app/base/components/node/MachinesHeader/MachinesHeader.tsx index 1087e61b1f0..47f9a0fe6c5 100644 --- a/src/app/base/components/node/MachinesHeader/MachinesHeader.tsx +++ b/src/app/base/components/node/MachinesHeader/MachinesHeader.tsx @@ -1,8 +1,8 @@ import type { SectionHeaderProps } from "@/app/base/components/SectionHeader"; import SectionHeader from "@/app/base/components/SectionHeader"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; -import { actions as tagActions } from "@/app/store/tag"; +import { resourcePoolActions } from "@/app/store/resourcepool"; +import { tagActions } from "@/app/store/tag"; type Props = SectionHeaderProps & { machineCount: number }; export const MachinesHeader = ({ diff --git a/src/app/base/components/node/NodeDevices/NodeDevices.test.tsx b/src/app/base/components/node/NodeDevices/NodeDevices.test.tsx index 1014e873cf8..8471c0db4b7 100644 --- a/src/app/base/components/node/NodeDevices/NodeDevices.test.tsx +++ b/src/app/base/components/node/NodeDevices/NodeDevices.test.tsx @@ -4,7 +4,7 @@ import NodeDevices from "./NodeDevices"; import { HardwareType } from "@/app/base/enum"; import urls from "@/app/base/urls"; -import { actions as nodeDeviceActions } from "@/app/store/nodedevice"; +import { nodeDeviceActions } from "@/app/store/nodedevice"; import { NodeDeviceBus } from "@/app/store/nodedevice/types"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/base/components/node/NodeDevices/NodeDevices.tsx b/src/app/base/components/node/NodeDevices/NodeDevices.tsx index bff9dca1614..5701a86f564 100644 --- a/src/app/base/components/node/NodeDevices/NodeDevices.tsx +++ b/src/app/base/components/node/NodeDevices/NodeDevices.tsx @@ -15,7 +15,7 @@ import urls from "@/app/base/urls"; import type { MachineSetSidePanelContent } from "@/app/machines/types"; import type { ControllerDetails } from "@/app/store/controller/types"; import type { MachineDetails } from "@/app/store/machine/types"; -import { actions as nodeDeviceActions } from "@/app/store/nodedevice"; +import { nodeDeviceActions } from "@/app/store/nodedevice"; import nodeDeviceSelectors from "@/app/store/nodedevice/selectors"; import { NodeDeviceBus } from "@/app/store/nodedevice/types"; import type { NodeDevice } from "@/app/store/nodedevice/types"; diff --git a/src/app/base/components/node/NodeLogs/DownloadMenu/DownloadMenu.tsx b/src/app/base/components/node/NodeLogs/DownloadMenu/DownloadMenu.tsx index 860873ee607..f967832965b 100644 --- a/src/app/base/components/node/NodeLogs/DownloadMenu/DownloadMenu.tsx +++ b/src/app/base/components/node/NodeLogs/DownloadMenu/DownloadMenu.tsx @@ -14,11 +14,11 @@ import { useGetInstallationOutput } from "../hooks"; import FileContext from "@/app/base/file-context"; import { useSendAnalytics } from "@/app/base/hooks"; import { api } from "@/app/base/sagas/http"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import type { ControllerDetails } from "@/app/store/controller/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineDetails } from "@/app/store/machine/types"; -import { actions as messageActions } from "@/app/store/message"; +import { messageActions } from "@/app/store/message"; import type { RootState } from "@/app/store/root/types"; import scriptResultSelectors from "@/app/store/scriptresult/selectors"; import { ScriptResultNames } from "@/app/store/scriptresult/types"; diff --git a/src/app/base/components/node/NodeLogs/EventLogs/EventLogs.tsx b/src/app/base/components/node/NodeLogs/EventLogs/EventLogs.tsx index c5062d658bb..aa9ac50f827 100644 --- a/src/app/base/components/node/NodeLogs/EventLogs/EventLogs.tsx +++ b/src/app/base/components/node/NodeLogs/EventLogs/EventLogs.tsx @@ -10,7 +10,7 @@ import ArrowPagination from "@/app/base/components/ArrowPagination"; import { MAIN_CONTENT_SECTION_ID } from "@/app/base/components/MainContentSection/MainContentSection"; import SearchBox from "@/app/base/components/SearchBox"; import type { ControllerDetails } from "@/app/store/controller/types"; -import { actions as eventActions } from "@/app/store/event"; +import { eventActions } from "@/app/store/event"; import eventSelectors from "@/app/store/event/selectors"; import type { EventRecord } from "@/app/store/event/types"; import type { MachineDetails } from "@/app/store/machine/types"; diff --git a/src/app/base/components/node/NodeLogs/hooks.ts b/src/app/base/components/node/NodeLogs/hooks.ts index 2514bb676be..596042e0118 100644 --- a/src/app/base/components/node/NodeLogs/hooks.ts +++ b/src/app/base/components/node/NodeLogs/hooks.ts @@ -3,7 +3,7 @@ import { useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; import type { RootState } from "@/app/store/root/types"; -import { actions as scriptResultActions } from "@/app/store/scriptresult"; +import { scriptResultActions } from "@/app/store/scriptresult"; import scriptResultSelectors from "@/app/store/scriptresult/selectors"; import { ScriptResultDataType, diff --git a/src/app/base/components/node/NodeTestDetails/NodeTestDetails.tsx b/src/app/base/components/node/NodeTestDetails/NodeTestDetails.tsx index 63f792282bf..adbe283feeb 100644 --- a/src/app/base/components/node/NodeTestDetails/NodeTestDetails.tsx +++ b/src/app/base/components/node/NodeTestDetails/NodeTestDetails.tsx @@ -9,7 +9,7 @@ import NodeTestDetailsLogs from "./NodeTestDetailsLogs"; import ScriptStatus from "@/app/base/components/ScriptStatus"; import { useGetURLId } from "@/app/base/hooks/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as scriptResultActions } from "@/app/store/scriptresult"; +import { scriptResultActions } from "@/app/store/scriptresult"; import scriptResultSelectors from "@/app/store/scriptresult/selectors"; import type { ScriptResultResult } from "@/app/store/scriptresult/types"; import { diff --git a/src/app/base/components/node/NodeTestsTable/NodeTestsTable.tsx b/src/app/base/components/node/NodeTestsTable/NodeTestsTable.tsx index 5dea0a69402..8a82a260e8d 100644 --- a/src/app/base/components/node/NodeTestsTable/NodeTestsTable.tsx +++ b/src/app/base/components/node/NodeTestsTable/NodeTestsTable.tsx @@ -13,7 +13,7 @@ import ScriptStatus from "@/app/base/components/ScriptStatus"; import TableHeader from "@/app/base/components/TableHeader"; import { useSendAnalytics } from "@/app/base/hooks"; import type { ControllerDetails } from "@/app/store/controller/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineDetails } from "@/app/store/machine/types"; import type { ScriptResult } from "@/app/store/scriptresult/types"; import { ScriptResultType } from "@/app/store/scriptresult/types"; diff --git a/src/app/base/components/node/NodeTestsTable/TestHistory/TestHistory.tsx b/src/app/base/components/node/NodeTestsTable/TestHistory/TestHistory.tsx index bb4420b6375..fd09df8a46f 100644 --- a/src/app/base/components/node/NodeTestsTable/TestHistory/TestHistory.tsx +++ b/src/app/base/components/node/NodeTestsTable/TestHistory/TestHistory.tsx @@ -7,7 +7,7 @@ import { Link, useLocation } from "react-router-dom-v5-compat"; import ScriptStatus from "@/app/base/components/ScriptStatus"; import type { RootState } from "@/app/store/root/types"; -import { actions as scriptResultActions } from "@/app/store/scriptresult"; +import { scriptResultActions } from "@/app/store/scriptresult"; import scriptResultSelectors from "@/app/store/scriptresult/selectors"; import type { ScriptResult } from "@/app/store/scriptresult/types"; import { ScriptResultType } from "@/app/store/scriptresult/types"; diff --git a/src/app/base/components/node/OverviewCard/ControllerStatusCard/ControllerStatusCard.test.tsx b/src/app/base/components/node/OverviewCard/ControllerStatusCard/ControllerStatusCard.test.tsx index eb9b5f0ba57..958b1fbdeea 100644 --- a/src/app/base/components/node/OverviewCard/ControllerStatusCard/ControllerStatusCard.test.tsx +++ b/src/app/base/components/node/OverviewCard/ControllerStatusCard/ControllerStatusCard.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import ControllerStatusCard, { Labels } from "./ControllerStatusCard"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import { ControllerInstallType, ImageSyncStatus, diff --git a/src/app/base/components/node/OverviewCard/ControllerStatusCard/ControllerStatusCard.tsx b/src/app/base/components/node/OverviewCard/ControllerStatusCard/ControllerStatusCard.tsx index 20f3f5cee33..35a5b5fdafd 100644 --- a/src/app/base/components/node/OverviewCard/ControllerStatusCard/ControllerStatusCard.tsx +++ b/src/app/base/components/node/OverviewCard/ControllerStatusCard/ControllerStatusCard.tsx @@ -6,7 +6,7 @@ import { nanoid } from "@reduxjs/toolkit"; import { useDispatch, useSelector } from "react-redux"; import TooltipButton from "@/app/base/components/TooltipButton"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import { ControllerInstallType, diff --git a/src/app/base/components/node/OverviewCard/DetailsCard/DetailsCard.tsx b/src/app/base/components/node/OverviewCard/DetailsCard/DetailsCard.tsx index 035ac1a4aa0..784b74b7270 100644 --- a/src/app/base/components/node/OverviewCard/DetailsCard/DetailsCard.tsx +++ b/src/app/base/components/node/OverviewCard/DetailsCard/DetailsCard.tsx @@ -10,12 +10,12 @@ import { } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import type { ControllerDetails } from "@/app/store/controller/types"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { PowerTypeNames } from "@/app/store/general/constants"; import { powerTypes as powerTypesSelectors } from "@/app/store/general/selectors"; import type { MachineDetails } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import { getTagsDisplay } from "@/app/store/tag/utils"; import { nodeIsMachine } from "@/app/store/utils"; diff --git a/src/app/base/components/node/PowerOffForm/PowerOffForm.test.tsx b/src/app/base/components/node/PowerOffForm/PowerOffForm.test.tsx index 96d8df07f5f..8fafad54776 100644 --- a/src/app/base/components/node/PowerOffForm/PowerOffForm.test.tsx +++ b/src/app/base/components/node/PowerOffForm/PowerOffForm.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import PowerOffForm from "./PowerOffForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import { NodeActions } from "@/app/store/types/node"; import * as factory from "@/testing/factories"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/AddLogicalVolume/AddLogicalVolume.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/AddLogicalVolume/AddLogicalVolume.tsx index 33a58faf357..a15d5d62338 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/AddLogicalVolume/AddLogicalVolume.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/AddLogicalVolume/AddLogicalVolume.tsx @@ -6,7 +6,7 @@ import AddLogicalVolumeFields from "./AddLogicalVolumeFields"; import FormikForm from "@/app/base/components/FormikForm"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { MIN_PARTITION_SIZE } from "@/app/store/machine/constants"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/AddPartition/AddPartition.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/AddPartition/AddPartition.tsx index 94fb9d3aed5..2d3397ffca8 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/AddPartition/AddPartition.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/AddPartition/AddPartition.tsx @@ -6,7 +6,7 @@ import AddPartitionFields from "./AddPartitionFields"; import FormikForm from "@/app/base/components/FormikForm"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { MIN_PARTITION_SIZE } from "@/app/store/machine/constants"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateDatastore/CreateDatastore.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateDatastore/CreateDatastore.tsx index 12f8ec39560..f73a54bdcb4 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateDatastore/CreateDatastore.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateDatastore/CreateDatastore.tsx @@ -13,7 +13,7 @@ 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 { 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"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateRaid/CreateRaid.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateRaid/CreateRaid.tsx index 0dc79039c36..64eb3443511 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateRaid/CreateRaid.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateRaid/CreateRaid.tsx @@ -5,7 +5,7 @@ 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 { 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"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateVolumeGroup/CreateVolumeGroup.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateVolumeGroup/CreateVolumeGroup.tsx index 48e22c53c28..63754cc5c51 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateVolumeGroup/CreateVolumeGroup.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/CreateVolumeGroup/CreateVolumeGroup.tsx @@ -13,7 +13,7 @@ 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 { 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"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/UpdateDatastore/UpdateDatastore.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/UpdateDatastore/UpdateDatastore.tsx index 22da89bc828..1cfb0cd7336 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/UpdateDatastore/UpdateDatastore.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/BulkActions/UpdateDatastore/UpdateDatastore.tsx @@ -5,7 +5,7 @@ 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 { 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"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/CreateBcache/CreateBcache.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/CreateBcache/CreateBcache.tsx index 0347e5c8d20..b0dd97da4e4 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/CreateBcache/CreateBcache.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/CreateBcache/CreateBcache.tsx @@ -5,7 +5,7 @@ import CreateBcacheFields from "./CreateBcacheFields"; import FormikForm from "@/app/base/components/FormikForm"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; import { BcacheModes } from "@/app/store/machine/types"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/CreateCacheSet/CreateCacheSet.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/CreateCacheSet/CreateCacheSet.tsx index 1a7b0669d68..ae43d12d6b6 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/CreateCacheSet/CreateCacheSet.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/CreateCacheSet/CreateCacheSet.tsx @@ -1,7 +1,7 @@ import { useDispatch } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { Machine } from "@/app/store/machine/types"; import type { Disk, Partition } from "@/app/store/types/node"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/DeleteDisk/DeleteDisk.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/DeleteDisk/DeleteDisk.tsx index c0c6024b2af..d563dd2b431 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/DeleteDisk/DeleteDisk.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/DeleteDisk/DeleteDisk.tsx @@ -1,7 +1,7 @@ import { useDispatch } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { Machine } from "@/app/store/machine/types"; import type { Disk } from "@/app/store/types/node"; import { formatType } from "@/app/store/utils"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/DeletePartition/DeletePartition.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/DeletePartition/DeletePartition.tsx index f99544fabe4..fd9c2079494 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/DeletePartition/DeletePartition.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/DeletePartition/DeletePartition.tsx @@ -1,7 +1,7 @@ import { useDispatch } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { Machine } from "@/app/store/machine/types"; import type { Partition } from "@/app/store/types/node"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/DeleteVolumeGroup/DeleteVolumeGroup.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/DeleteVolumeGroup/DeleteVolumeGroup.tsx index 48612f75332..176e9041e37 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/DeleteVolumeGroup/DeleteVolumeGroup.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/DeleteVolumeGroup/DeleteVolumeGroup.tsx @@ -1,7 +1,7 @@ import { useDispatch } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { Machine } from "@/app/store/machine/types"; import type { Disk } from "@/app/store/types/node"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/EditDisk/EditDisk.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/EditDisk/EditDisk.tsx index bc6b40dec61..0b0af46002c 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/EditDisk/EditDisk.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/EditDisk/EditDisk.tsx @@ -5,7 +5,7 @@ import EditDiskFields from "./EditDiskFields"; import FormikForm from "@/app/base/components/FormikForm"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { Machine } from "@/app/store/machine/types"; import type { MachineEventErrors } from "@/app/store/machine/types/base"; import type { Disk } from "@/app/store/types/node"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/EditPartition/EditPartition.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/EditPartition/EditPartition.tsx index 840abc7d64d..5dca1aa7091 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/EditPartition/EditPartition.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/EditPartition/EditPartition.tsx @@ -5,7 +5,7 @@ import EditPartitionFields from "./EditPartitionFields"; import FormikForm from "@/app/base/components/FormikForm"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { 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"; diff --git a/src/app/base/components/node/StorageTables/AvailableStorageTable/SetBootDisk/SetBootDisk.tsx b/src/app/base/components/node/StorageTables/AvailableStorageTable/SetBootDisk/SetBootDisk.tsx index 10555fed369..fa24202f98f 100644 --- a/src/app/base/components/node/StorageTables/AvailableStorageTable/SetBootDisk/SetBootDisk.tsx +++ b/src/app/base/components/node/StorageTables/AvailableStorageTable/SetBootDisk/SetBootDisk.tsx @@ -1,7 +1,7 @@ import { useDispatch } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { Machine } from "@/app/store/machine/types"; import type { Disk } from "@/app/store/types/node"; diff --git a/src/app/base/components/node/StorageTables/CacheSetsTable/CacheSetsTable.test.tsx b/src/app/base/components/node/StorageTables/CacheSetsTable/CacheSetsTable.test.tsx index f8659b85997..b3742e03ceb 100644 --- a/src/app/base/components/node/StorageTables/CacheSetsTable/CacheSetsTable.test.tsx +++ b/src/app/base/components/node/StorageTables/CacheSetsTable/CacheSetsTable.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import CacheSetsTable from "./CacheSetsTable"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { DiskTypes } from "@/app/store/types/enum"; import * as factory from "@/testing/factories"; import { userEvent, render, screen } from "@/testing/utils"; diff --git a/src/app/base/components/node/StorageTables/CacheSetsTable/CacheSetsTable.tsx b/src/app/base/components/node/StorageTables/CacheSetsTable/CacheSetsTable.tsx index e2746a1acf4..6fc290c8476 100644 --- a/src/app/base/components/node/StorageTables/CacheSetsTable/CacheSetsTable.tsx +++ b/src/app/base/components/node/StorageTables/CacheSetsTable/CacheSetsTable.tsx @@ -7,7 +7,7 @@ import { useDispatch } from "react-redux"; import TableActionsDropdown from "@/app/base/components/TableActionsDropdown"; import ActionConfirm from "@/app/base/components/node/ActionConfirm"; import type { ControllerDetails } from "@/app/store/controller/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineDetails } from "@/app/store/machine/types"; import { formatSize, isCacheSet, nodeIsMachine } from "@/app/store/utils"; diff --git a/src/app/base/components/node/StorageTables/DatastoresTable/DatastoresTable.test.tsx b/src/app/base/components/node/StorageTables/DatastoresTable/DatastoresTable.test.tsx index 6e213dddae1..303e21839b5 100644 --- a/src/app/base/components/node/StorageTables/DatastoresTable/DatastoresTable.test.tsx +++ b/src/app/base/components/node/StorageTables/DatastoresTable/DatastoresTable.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import DatastoresTable from "./DatastoresTable"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as factory from "@/testing/factories"; import { userEvent, render, screen } from "@/testing/utils"; diff --git a/src/app/base/components/node/StorageTables/DatastoresTable/DatastoresTable.tsx b/src/app/base/components/node/StorageTables/DatastoresTable/DatastoresTable.tsx index a68304a331f..6642c7c7f03 100644 --- a/src/app/base/components/node/StorageTables/DatastoresTable/DatastoresTable.tsx +++ b/src/app/base/components/node/StorageTables/DatastoresTable/DatastoresTable.tsx @@ -7,7 +7,7 @@ import { useDispatch } from "react-redux"; import TableActionsDropdown from "@/app/base/components/TableActionsDropdown"; import ActionConfirm from "@/app/base/components/node/ActionConfirm"; import type { ControllerDetails } from "@/app/store/controller/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineDetails } from "@/app/store/machine/types"; import { formatSize, isDatastore, nodeIsMachine } from "@/app/store/utils"; diff --git a/src/app/base/components/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.test.tsx b/src/app/base/components/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.test.tsx index ad43fc0d026..67970b08fbf 100644 --- a/src/app/base/components/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.test.tsx +++ b/src/app/base/components/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import AddSpecialFilesystem from "./AddSpecialFilesystem"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/base/components/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.tsx b/src/app/base/components/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.tsx index 9a72ad0452e..c1097caa016 100644 --- a/src/app/base/components/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.tsx +++ b/src/app/base/components/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.tsx @@ -5,7 +5,7 @@ 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 { 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"; diff --git a/src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.test.tsx b/src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.test.tsx index 23b0fa2d8fc..c4f871298b5 100644 --- a/src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.test.tsx +++ b/src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import FilesystemsTable from "./FilesystemsTable"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as factory from "@/testing/factories"; import { userEvent, render, screen } from "@/testing/utils"; diff --git a/src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.tsx b/src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.tsx index 7d5a475af47..1c3d3ee970d 100644 --- a/src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.tsx +++ b/src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.tsx @@ -9,7 +9,7 @@ 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 { machineActions } from "@/app/store/machine"; import type { MachineDetails } from "@/app/store/machine/types"; import type { Filesystem, Disk, Partition } from "@/app/store/types/node"; import { diff --git a/src/app/base/components/node/TestForm/TestForm.test.tsx b/src/app/base/components/node/TestForm/TestForm.test.tsx index eed009ff787..fd2a4a27f3b 100644 --- a/src/app/base/components/node/TestForm/TestForm.test.tsx +++ b/src/app/base/components/node/TestForm/TestForm.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import TestForm from "./TestForm"; import { HardwareType } from "@/app/base/enum"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import { ScriptType } from "@/app/store/script/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/base/components/node/TestForm/TestForm.tsx b/src/app/base/components/node/TestForm/TestForm.tsx index 5a975e509b6..456a2f4a473 100644 --- a/src/app/base/components/node/TestForm/TestForm.tsx +++ b/src/app/base/components/node/TestForm/TestForm.tsx @@ -9,7 +9,7 @@ import TestFormFields from "./TestFormFields"; import ActionForm from "@/app/base/components/ActionForm"; import type { HardwareType } from "@/app/base/enum"; -import { actions as scriptActions } from "@/app/store/script"; +import { scriptActions } from "@/app/store/script"; import scriptSelectors from "@/app/store/script/selectors"; import type { Script } from "@/app/store/script/types"; import { getObjectString } from "@/app/store/script/utils"; diff --git a/src/app/base/components/node/TestForm/TestFormFields/TestFormFields.test.tsx b/src/app/base/components/node/TestForm/TestFormFields/TestFormFields.test.tsx index 014926984a9..ca6f89da312 100644 --- a/src/app/base/components/node/TestForm/TestFormFields/TestFormFields.test.tsx +++ b/src/app/base/components/node/TestForm/TestFormFields/TestFormFields.test.tsx @@ -1,6 +1,6 @@ import TestForm from "../TestForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import { ScriptType } from "@/app/store/script/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/base/components/node/networking/NetworkTable/IPColumn/IPColumn.tsx b/src/app/base/components/node/networking/NetworkTable/IPColumn/IPColumn.tsx index e0759551dc8..fe411345ccc 100644 --- a/src/app/base/components/node/networking/NetworkTable/IPColumn/IPColumn.tsx +++ b/src/app/base/components/node/networking/NetworkTable/IPColumn/IPColumn.tsx @@ -7,7 +7,7 @@ import type { ControllerDetails } from "@/app/store/controller/types"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { MachineDetails } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as scriptResultActions } from "@/app/store/scriptresult"; +import { scriptResultActions } from "@/app/store/scriptresult"; import scriptResultsSelectors from "@/app/store/scriptresult/selectors"; import type { ScriptResult } from "@/app/store/scriptresult/types"; import type { NetworkInterface, NetworkLink } from "@/app/store/types/node"; diff --git a/src/app/base/components/node/networking/NetworkTable/NetworkTable.tsx b/src/app/base/components/node/networking/NetworkTable/NetworkTable.tsx index 9f01a371af2..87b060f48ed 100644 --- a/src/app/base/components/node/networking/NetworkTable/NetworkTable.tsx +++ b/src/app/base/components/node/networking/NetworkTable/NetworkTable.tsx @@ -31,11 +31,11 @@ import type { Sort } from "@/app/base/types"; import { SortDirection } from "@/app/base/types"; import NetworkTableActions from "@/app/machines/views/MachineDetails/MachineNetwork/NetworkTable/NetworkTableActions"; import type { ControllerDetails } from "@/app/store/controller/types"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { Fabric } from "@/app/store/fabric/types"; import type { MachineDetails } from "@/app/store/machine/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; import { getSubnetDisplay } from "@/app/store/subnet/utils"; @@ -52,7 +52,7 @@ import { isBootInterface, nodeIsMachine, } from "@/app/store/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import type { VLAN } from "@/app/store/vlan/types"; import { getDHCPStatus } from "@/app/store/vlan/utils"; diff --git a/src/app/base/hooks/base.ts b/src/app/base/hooks/base.ts index 08a2c8a0a8d..ed877551802 100644 --- a/src/app/base/hooks/base.ts +++ b/src/app/base/hooks/base.ts @@ -9,7 +9,7 @@ import { useLocation } from "react-router-dom"; import type { KeyboardShortcut } from "../constants"; import configSelectors from "@/app/store/config/selectors"; -import { actions as messageActions } from "@/app/store/message"; +import { messageActions } from "@/app/store/message"; /** * Add a message in response to a state change e.g. when something is created. diff --git a/src/app/base/hooks/node.test.tsx b/src/app/base/hooks/node.test.tsx index b1c4dc12629..fafc55455a9 100644 --- a/src/app/base/hooks/node.test.tsx +++ b/src/app/base/hooks/node.test.tsx @@ -13,7 +13,7 @@ import { useMachineActions, } from "./node"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { Machine } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; import { NodeActions } from "@/app/store/types/node"; diff --git a/src/app/base/hooks/node.ts b/src/app/base/hooks/node.ts index 0628a626303..66aca7272bd 100644 --- a/src/app/base/hooks/node.ts +++ b/src/app/base/hooks/node.ts @@ -4,12 +4,12 @@ import type { ButtonProps, MenuLink } from "@canonical/react-components"; import { useDispatch, useSelector } from "react-redux"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { machineActions as machineActionsSelectors, powerTypes as powerTypesSelectors, } from "@/app/store/general/selectors"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { MachineActions, MachineDetails } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/base/sagas/actions.test.ts b/src/app/base/sagas/actions.test.ts index 82f09879268..75c141009e5 100644 --- a/src/app/base/sagas/actions.test.ts +++ b/src/app/base/sagas/actions.test.ts @@ -13,9 +13,9 @@ import { updateDomainRecord, } from "./actions"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import { RecordType } from "@/app/store/domain/types"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import * as factory from "@/testing/factories"; vi.mock("../../../websocket-client"); diff --git a/src/app/base/sagas/actions.ts b/src/app/base/sagas/actions.ts index 357f42198ee..9f5266b4639 100644 --- a/src/app/base/sagas/actions.ts +++ b/src/app/base/sagas/actions.ts @@ -9,15 +9,15 @@ import type { WebSocketResponseResult, } from "../../../websocket-client"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import type { DeleteRecordParams, UpdateRecordParams, } from "@/app/store/domain/types"; import { isAddressRecord } from "@/app/store/domain/utils"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { FetchFilters, Machine } from "@/app/store/machine/types"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import type { CreateWithMachinesParams, ResourcePool, diff --git a/src/app/base/sagas/websockets/handlers/unsubscribe.ts b/src/app/base/sagas/websockets/handlers/unsubscribe.ts index d5d025560ac..d4e5c89cafd 100644 --- a/src/app/base/sagas/websockets/handlers/unsubscribe.ts +++ b/src/app/base/sagas/websockets/handlers/unsubscribe.ts @@ -1,7 +1,7 @@ import type { AnyAction } from "redux"; import { select, type SagaGenerator, put } from "typed-redux-saga"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import { MachineMeta } from "@/app/store/machine/types"; import type { WebSocketAction } from "websocket-client"; diff --git a/src/app/base/sagas/websockets/websockets.test.ts b/src/app/base/sagas/websockets/websockets.test.ts index 50eda90973e..dcf175e9f5e 100644 --- a/src/app/base/sagas/websockets/websockets.test.ts +++ b/src/app/base/sagas/websockets/websockets.test.ts @@ -23,7 +23,7 @@ import { watchWebSockets, } from "./websockets"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { getCookie } from "@/app/utils"; import * as factory from "@/testing/factories"; import WebSocketClient, { diff --git a/src/app/controllers/components/ControllerForms/ControllerActionFormWrapper/ControllerActionFormWrapper.test.tsx b/src/app/controllers/components/ControllerForms/ControllerActionFormWrapper/ControllerActionFormWrapper.test.tsx index 7fee06683bc..0fb8db45af0 100644 --- a/src/app/controllers/components/ControllerForms/ControllerActionFormWrapper/ControllerActionFormWrapper.test.tsx +++ b/src/app/controllers/components/ControllerForms/ControllerActionFormWrapper/ControllerActionFormWrapper.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import ControllerActionFormWrapper from "./ControllerActionFormWrapper"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import type { RootState } from "@/app/store/root/types"; import { NodeActions } from "@/app/store/types/node"; import * as factory from "@/testing/factories"; diff --git a/src/app/controllers/components/ControllerForms/ControllerActionFormWrapper/ControllerActionFormWrapper.tsx b/src/app/controllers/components/ControllerForms/ControllerActionFormWrapper/ControllerActionFormWrapper.tsx index bbd29269bc6..e31a3c542c6 100644 --- a/src/app/controllers/components/ControllerForms/ControllerActionFormWrapper/ControllerActionFormWrapper.tsx +++ b/src/app/controllers/components/ControllerForms/ControllerActionFormWrapper/ControllerActionFormWrapper.tsx @@ -8,7 +8,7 @@ import TestForm from "@/app/base/components/node/TestForm"; import type { HardwareType } from "@/app/base/enum"; import type { ClearSidePanelContent } from "@/app/base/types"; import urls from "@/app/base/urls"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors, { statusSelectors, } from "@/app/store/controller/selectors"; diff --git a/src/app/controllers/components/ControllerStatus/ControllerStatus.tsx b/src/app/controllers/components/ControllerStatus/ControllerStatus.tsx index beccbca6730..3fb630210a1 100644 --- a/src/app/controllers/components/ControllerStatus/ControllerStatus.tsx +++ b/src/app/controllers/components/ControllerStatus/ControllerStatus.tsx @@ -6,7 +6,7 @@ import { useFetchActions } from "@/app/base/hooks"; import controllerSelectors from "@/app/store/controller/selectors"; import type { Controller, ControllerMeta } from "@/app/store/controller/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as serviceActions } from "@/app/store/service"; +import { serviceActions } from "@/app/store/service"; import { ServiceStatus } from "@/app/store/service/types"; import type { Service } from "@/app/store/service/types"; diff --git a/src/app/controllers/components/ImageStatus/ImageStatus.tsx b/src/app/controllers/components/ImageStatus/ImageStatus.tsx index 4d29f44bf3c..5ba2384c9db 100644 --- a/src/app/controllers/components/ImageStatus/ImageStatus.tsx +++ b/src/app/controllers/components/ImageStatus/ImageStatus.tsx @@ -4,7 +4,7 @@ import { Icon, Spinner } from "@canonical/react-components"; import { nanoid } from "@reduxjs/toolkit"; import { useDispatch, useSelector } from "react-redux"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import { ControllerMeta, ImageSyncStatus } from "@/app/store/controller/types"; import type { Controller } from "@/app/store/controller/types"; diff --git a/src/app/controllers/views/ControllerDetails/ControllerCommissioning/ControllerCommissioning.test.tsx b/src/app/controllers/views/ControllerDetails/ControllerCommissioning/ControllerCommissioning.test.tsx index a3063f07114..54f9de460f4 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerCommissioning/ControllerCommissioning.test.tsx +++ b/src/app/controllers/views/ControllerDetails/ControllerCommissioning/ControllerCommissioning.test.tsx @@ -6,7 +6,7 @@ import configureStore from "redux-mock-store"; import ControllerCommissioning from "./ControllerCommissioning"; import { HardwareType } from "@/app/base/enum"; -import { actions as scriptResultActions } from "@/app/store/scriptresult"; +import { scriptResultActions } from "@/app/store/scriptresult"; import { ScriptResultType } from "@/app/store/scriptresult/types"; import { TestStatusStatus } from "@/app/store/types/node"; import * as factory from "@/testing/factories"; diff --git a/src/app/controllers/views/ControllerDetails/ControllerCommissioning/ControllerCommissioning.tsx b/src/app/controllers/views/ControllerDetails/ControllerCommissioning/ControllerCommissioning.tsx index fa885378635..49226962895 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerCommissioning/ControllerCommissioning.tsx +++ b/src/app/controllers/views/ControllerDetails/ControllerCommissioning/ControllerCommissioning.tsx @@ -9,7 +9,7 @@ import controllerSelectors from "@/app/store/controller/selectors"; import type { Controller, ControllerMeta } from "@/app/store/controller/types"; import { isControllerDetails } from "@/app/store/controller/utils"; import type { RootState } from "@/app/store/root/types"; -import { actions as scriptResultActions } from "@/app/store/scriptresult"; +import { scriptResultActions } from "@/app/store/scriptresult"; import scriptResultSelectors from "@/app/store/scriptresult/selectors"; import { TestStatusStatus } from "@/app/store/types/node"; diff --git a/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerConfiguration.test.tsx b/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerConfiguration.test.tsx index 52159ec1969..5e4dee57b6c 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerConfiguration.test.tsx +++ b/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerConfiguration.test.tsx @@ -11,7 +11,7 @@ import { Labels as EditableSectionLabels } from "@/app/base/components/EditableS import { Label as NodeConfigurationFieldsLabel } from "@/app/base/components/NodeConfigurationFields/NodeConfigurationFields"; import { Label as TagFieldLabel } from "@/app/base/components/TagField/TagField"; import { Label as ZoneSelectLabel } from "@/app/base/components/ZoneSelect/ZoneSelect"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import { PodType } from "@/app/store/pod/constants"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerConfigurationForm.tsx b/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerConfigurationForm.tsx index 86210b41123..db3e59dfa33 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerConfigurationForm.tsx +++ b/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerConfigurationForm.tsx @@ -13,16 +13,16 @@ import type { NodeConfigurationValues } from "@/app/base/components/NodeConfigur import TagLinks from "@/app/base/components/TagLinks"; import { useFetchActions, useCanEdit } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import { FilterControllers, isControllerDetails, } from "@/app/store/controller/utils"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineDetails } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; type Props = { systemId: MachineDetails["system_id"] }; diff --git a/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerPowerConfiguration.tsx b/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerPowerConfiguration.tsx index 2a626803fad..0e2545aa03c 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerPowerConfiguration.tsx +++ b/src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerPowerConfiguration.tsx @@ -11,7 +11,7 @@ import PowerTypeFields from "@/app/base/components/PowerTypeFields"; import NodePowerParameters from "@/app/base/components/node/NodePowerParameters"; import { useCanEdit, useWindowTitle } from "@/app/base/hooks"; import authSelectors from "@/app/store/auth/selectors"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import type { Controller, diff --git a/src/app/controllers/views/ControllerDetails/ControllerDetails.test.tsx b/src/app/controllers/views/ControllerDetails/ControllerDetails.test.tsx index e2fe9f145e2..d0ea464371e 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerDetails.test.tsx +++ b/src/app/controllers/views/ControllerDetails/ControllerDetails.test.tsx @@ -9,7 +9,7 @@ import { ControllerDetailsTabLabels } from "../../constants"; import ControllerDetails from "./ControllerDetails"; import urls from "@/app/base/urls"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import * as factory from "@/testing/factories"; import { userEvent, render, screen } from "@/testing/utils"; diff --git a/src/app/controllers/views/ControllerDetails/ControllerDetails.tsx b/src/app/controllers/views/ControllerDetails/ControllerDetails.tsx index d46cb196ad0..b4eaae067ce 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerDetails.tsx +++ b/src/app/controllers/views/ControllerDetails/ControllerDetails.tsx @@ -23,7 +23,7 @@ import { useGetURLId } from "@/app/base/hooks/urls"; import { useSidePanel } from "@/app/base/side-panel-context"; import urls from "@/app/base/urls"; import ControllerForms from "@/app/controllers/components/ControllerForms/ControllerForms"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import { ControllerMeta } from "@/app/store/controller/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/controllers/views/ControllerDetails/ControllerDetailsHeader/ControllerName/ControllerName.tsx b/src/app/controllers/views/ControllerDetails/ControllerDetailsHeader/ControllerName/ControllerName.tsx index dfff60a271c..d519ea05965 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerDetailsHeader/ControllerName/ControllerName.tsx +++ b/src/app/controllers/views/ControllerDetails/ControllerDetailsHeader/ControllerName/ControllerName.tsx @@ -2,10 +2,10 @@ import { useDispatch, useSelector } from "react-redux"; import NodeName from "@/app/base/components/NodeName"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import type { Controller } from "@/app/store/controller/types"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/controllers/views/ControllerDetails/ControllerSummary/ServicesCard/ServicesCard.test.tsx b/src/app/controllers/views/ControllerDetails/ControllerSummary/ServicesCard/ServicesCard.test.tsx index 1ebbc925aa2..003073e79b4 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerSummary/ServicesCard/ServicesCard.test.tsx +++ b/src/app/controllers/views/ControllerDetails/ControllerSummary/ServicesCard/ServicesCard.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import ServicesCard from "./ServicesCard"; -import { actions as serviceActions } from "@/app/store/service"; +import { serviceActions } from "@/app/store/service"; import { ServiceName, ServiceStatus } from "@/app/store/service/types"; import { getServiceDisplayName } from "@/app/store/service/utils"; import { NodeType } from "@/app/store/types/node"; diff --git a/src/app/controllers/views/ControllerDetails/ControllerSummary/ServicesCard/ServicesCard.tsx b/src/app/controllers/views/ControllerDetails/ControllerSummary/ServicesCard/ServicesCard.tsx index 904f44448e9..a9c235ee1d2 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerSummary/ServicesCard/ServicesCard.tsx +++ b/src/app/controllers/views/ControllerDetails/ControllerSummary/ServicesCard/ServicesCard.tsx @@ -8,7 +8,7 @@ import ServiceStatus from "./ServiceStatus"; import { useFetchActions } from "@/app/base/hooks"; import type { ControllerDetails } from "@/app/store/controller/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as serviceActions } from "@/app/store/service"; +import { serviceActions } from "@/app/store/service"; import serviceSelectors from "@/app/store/service/selectors"; import type { Service } from "@/app/store/service/types"; import { diff --git a/src/app/controllers/views/ControllerDetails/ControllerVLANs/ControllerVLANsTable/hooks.ts b/src/app/controllers/views/ControllerDetails/ControllerVLANs/ControllerVLANsTable/hooks.ts index 9b1980e8cf6..2bd851723d2 100644 --- a/src/app/controllers/views/ControllerDetails/ControllerVLANs/ControllerVLANsTable/hooks.ts +++ b/src/app/controllers/views/ControllerDetails/ControllerVLANs/ControllerVLANsTable/hooks.ts @@ -11,17 +11,17 @@ import type { ControllerMeta, } from "@/app/store/controller/types"; import { isControllerDetails } from "@/app/store/controller/utils"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { Fabric } from "@/app/store/fabric/types"; import { getFabricById } from "@/app/store/fabric/utils"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; import { getSubnetsInVLAN } from "@/app/store/subnet/utils"; import { getBondOrBridgeChild } from "@/app/store/utils/node/networking"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import type { VLAN } from "@/app/store/vlan/types"; import { diff --git a/src/app/controllers/views/ControllerList/ControllerList.tsx b/src/app/controllers/views/ControllerList/ControllerList.tsx index 2beca551cde..42220148c6b 100644 --- a/src/app/controllers/views/ControllerList/ControllerList.tsx +++ b/src/app/controllers/views/ControllerList/ControllerList.tsx @@ -12,13 +12,13 @@ import VaultNotification from "@/app/base/components/VaultNotification"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; import { useSidePanel } from "@/app/base/side-panel-context"; import ControllerForms from "@/app/controllers/components/ControllerForms/ControllerForms"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import { FilterControllers } from "@/app/store/controller/utils"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { vaultEnabled as vaultEnabledSelectors } from "@/app/store/general/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import { getSidePanelTitle } from "@/app/store/utils/node/base"; const ControllerList = (): JSX.Element => { diff --git a/src/app/controllers/views/ControllerList/ControllerListTable/ControllerListTable.tsx b/src/app/controllers/views/ControllerList/ControllerListTable/ControllerListTable.tsx index f353b9572ea..ef148f45915 100644 --- a/src/app/controllers/views/ControllerList/ControllerListTable/ControllerListTable.tsx +++ b/src/app/controllers/views/ControllerList/ControllerListTable/ControllerListTable.tsx @@ -16,10 +16,10 @@ import docsUrls from "@/app/base/docsUrls"; import { useFetchActions, useTableSort } from "@/app/base/hooks"; import { SortDirection } from "@/app/base/types"; import ImageStatus from "@/app/controllers/components/ImageStatus"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import type { Controller, ControllerMeta } from "@/app/store/controller/types"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { vaultEnabled as vaultEnabledSelectors } from "@/app/store/general/selectors"; import type { RootState } from "@/app/store/root/types"; import { NodeType } from "@/app/store/types/node"; diff --git a/src/app/devices/components/DeviceHeaderForms/AddDeviceForm/AddDeviceForm.test.tsx b/src/app/devices/components/DeviceHeaderForms/AddDeviceForm/AddDeviceForm.test.tsx index 2dd14f4f507..02e260cefb3 100644 --- a/src/app/devices/components/DeviceHeaderForms/AddDeviceForm/AddDeviceForm.test.tsx +++ b/src/app/devices/components/DeviceHeaderForms/AddDeviceForm/AddDeviceForm.test.tsx @@ -2,12 +2,12 @@ import configureStore from "redux-mock-store"; import AddDeviceForm from "./AddDeviceForm"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import { DeviceIpAssignment } from "@/app/store/device/types"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; -import { actions as zoneActions } from "@/app/store/zone"; +import { subnetActions } from "@/app/store/subnet"; +import { zoneActions } from "@/app/store/zone"; import * as factory from "@/testing/factories"; import { userEvent, diff --git a/src/app/devices/components/DeviceHeaderForms/AddDeviceForm/AddDeviceForm.tsx b/src/app/devices/components/DeviceHeaderForms/AddDeviceForm/AddDeviceForm.tsx index 989563c839d..4657c5697d2 100644 --- a/src/app/devices/components/DeviceHeaderForms/AddDeviceForm/AddDeviceForm.tsx +++ b/src/app/devices/components/DeviceHeaderForms/AddDeviceForm/AddDeviceForm.tsx @@ -14,14 +14,14 @@ import ZoneSelect from "@/app/base/components/ZoneSelect"; import { useFetchActions, useAddMessage } from "@/app/base/hooks"; import type { ClearSidePanelContent } from "@/app/base/types"; import { hostnameValidation, MAC_ADDRESS_REGEX } from "@/app/base/validation"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import { DeviceIpAssignment } from "@/app/store/device/types"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; type Props = { diff --git a/src/app/devices/components/DeviceHeaderForms/DeviceActionFormWrapper/DeviceActionFormWrapper.test.tsx b/src/app/devices/components/DeviceHeaderForms/DeviceActionFormWrapper/DeviceActionFormWrapper.test.tsx index 1ae7a5d719f..2ae6bded507 100644 --- a/src/app/devices/components/DeviceHeaderForms/DeviceActionFormWrapper/DeviceActionFormWrapper.test.tsx +++ b/src/app/devices/components/DeviceHeaderForms/DeviceActionFormWrapper/DeviceActionFormWrapper.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import DeviceActionFormWrapper from "./DeviceActionFormWrapper"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import type { RootState } from "@/app/store/root/types"; import { NodeActions } from "@/app/store/types/node"; import * as factory from "@/testing/factories"; diff --git a/src/app/devices/components/DeviceHeaderForms/DeviceActionFormWrapper/DeviceActionFormWrapper.tsx b/src/app/devices/components/DeviceHeaderForms/DeviceActionFormWrapper/DeviceActionFormWrapper.tsx index 7327c8ce67e..7e5909a00cc 100644 --- a/src/app/devices/components/DeviceHeaderForms/DeviceActionFormWrapper/DeviceActionFormWrapper.tsx +++ b/src/app/devices/components/DeviceHeaderForms/DeviceActionFormWrapper/DeviceActionFormWrapper.tsx @@ -5,7 +5,7 @@ import NodeActionFormWrapper from "@/app/base/components/node/NodeActionFormWrap import SetZoneForm from "@/app/base/components/node/SetZoneForm"; import type { ClearSidePanelContent } from "@/app/base/types"; import urls from "@/app/base/urls"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { Device, DeviceActions } from "@/app/store/device/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/devices/views/DeviceDetails/DeviceConfiguration/DeviceConfiguration.test.tsx b/src/app/devices/views/DeviceDetails/DeviceConfiguration/DeviceConfiguration.test.tsx index e90d962f23c..5056a64c880 100644 --- a/src/app/devices/views/DeviceDetails/DeviceConfiguration/DeviceConfiguration.test.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceConfiguration/DeviceConfiguration.test.tsx @@ -9,7 +9,7 @@ import { Labels as EditableSectionLabels } from "@/app/base/components/EditableS import { Label as DeviceConfigurationFieldsLabel } from "@/app/base/components/NodeConfigurationFields/NodeConfigurationFields"; import { Label as TagFieldLabel } from "@/app/base/components/TagField/TagField"; import { Label as ZoneSelectLabel } from "@/app/base/components/ZoneSelect/ZoneSelect"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/devices/views/DeviceDetails/DeviceConfiguration/DeviceConfiguration.tsx b/src/app/devices/views/DeviceDetails/DeviceConfiguration/DeviceConfiguration.tsx index 9ad084e4035..5e6aebbc244 100644 --- a/src/app/devices/views/DeviceDetails/DeviceConfiguration/DeviceConfiguration.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceConfiguration/DeviceConfiguration.tsx @@ -13,13 +13,13 @@ import type { NodeConfigurationValues } from "@/app/base/components/NodeConfigur import TagLinks from "@/app/base/components/TagLinks"; import { useWindowTitle } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { Device, DeviceMeta } from "@/app/store/device/types"; import { FilterDevices, isDeviceDetails } from "@/app/store/device/utils"; import type { RootState } from "@/app/store/root/types"; import tagSelectors from "@/app/store/tag/selectors"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; type Props = { diff --git a/src/app/devices/views/DeviceDetails/DeviceDetails.test.tsx b/src/app/devices/views/DeviceDetails/DeviceDetails.test.tsx index 4d0b0027b2b..7ef5809c499 100644 --- a/src/app/devices/views/DeviceDetails/DeviceDetails.test.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceDetails.test.tsx @@ -6,7 +6,7 @@ import { Label as DeviceNetworkLabel } from "./DeviceNetwork/DeviceNetwork"; import { Label as DeviceSummaryLabel } from "./DeviceSummary/DeviceSummary"; import urls from "@/app/base/urls"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { screen, renderWithBrowserRouter } from "@/testing/utils"; diff --git a/src/app/devices/views/DeviceDetails/DeviceDetails.tsx b/src/app/devices/views/DeviceDetails/DeviceDetails.tsx index f1bee7f9867..2051e1ad789 100644 --- a/src/app/devices/views/DeviceDetails/DeviceDetails.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceDetails.tsx @@ -16,11 +16,11 @@ import { useSidePanel } from "@/app/base/side-panel-context"; import urls from "@/app/base/urls"; import DeviceHeaderForms from "@/app/devices/components/DeviceHeaderForms"; import DeviceNetworkForms from "@/app/devices/components/DeviceNetworkForms"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import { DeviceMeta } from "@/app/store/device/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import { getSidePanelTitle } from "@/app/store/utils/node/base"; import { isId, getRelativeRoute } from "@/app/utils"; diff --git a/src/app/devices/views/DeviceDetails/DeviceDetailsHeader/DeviceName/DeviceName.tsx b/src/app/devices/views/DeviceDetails/DeviceDetailsHeader/DeviceName/DeviceName.tsx index f8cb94ff359..24bb0e5a8f8 100644 --- a/src/app/devices/views/DeviceDetails/DeviceDetailsHeader/DeviceName/DeviceName.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceDetailsHeader/DeviceName/DeviceName.tsx @@ -2,11 +2,11 @@ import { useDispatch, useSelector } from "react-redux"; import NodeName from "@/app/base/components/NodeName"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { Device } from "@/app/store/device/types"; import { DeviceMeta } from "@/app/store/device/types"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/devices/views/DeviceDetails/DeviceNetwork/AddInterface/AddInterface.test.tsx b/src/app/devices/views/DeviceDetails/DeviceNetwork/AddInterface/AddInterface.test.tsx index d4caa78b3d2..0c0bd3499e1 100644 --- a/src/app/devices/views/DeviceDetails/DeviceNetwork/AddInterface/AddInterface.test.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceNetwork/AddInterface/AddInterface.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import AddInterface from "./AddInterface"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import { DeviceIpAssignment } from "@/app/store/device/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/devices/views/DeviceDetails/DeviceNetwork/AddInterface/AddInterface.tsx b/src/app/devices/views/DeviceDetails/DeviceNetwork/AddInterface/AddInterface.tsx index 8f74eaaf764..b9e25ace17b 100644 --- a/src/app/devices/views/DeviceDetails/DeviceNetwork/AddInterface/AddInterface.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceNetwork/AddInterface/AddInterface.tsx @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from "react-redux"; import InterfaceForm from "../InterfaceForm"; import { useCycled, useScrollOnRender } from "@/app/base/hooks"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { CreateInterfaceParams, diff --git a/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/DeviceNetworkTable.tsx b/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/DeviceNetworkTable.tsx index 5b71b15b7de..e97464622bd 100644 --- a/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/DeviceNetworkTable.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/DeviceNetworkTable.tsx @@ -18,11 +18,11 @@ import { DeviceSidePanelViews } from "@/app/devices/constants"; import deviceSelectors from "@/app/store/device/selectors"; import type { Device, DeviceMeta } from "@/app/store/device/types"; import { isDeviceDetails } from "@/app/store/device/utils"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { Fabric } from "@/app/store/fabric/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; import { getSubnetDisplay } from "@/app/store/subnet/utils"; @@ -35,7 +35,7 @@ import { getLinkInterface, getLinkModeDisplay, } from "@/app/store/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import type { VLAN } from "@/app/store/vlan/types"; import { isComparable } from "@/app/utils"; diff --git a/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/RemoveInterface/RemoveInterface.test.tsx b/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/RemoveInterface/RemoveInterface.test.tsx index c2fa88a144a..c88ca45f64b 100644 --- a/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/RemoveInterface/RemoveInterface.test.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/RemoveInterface/RemoveInterface.test.tsx @@ -4,7 +4,7 @@ import RemoveInterface from "./RemoveInterface"; import * as analyticsHooks from "@/app/base/hooks/analytics"; import * as baseHooks from "@/app/base/hooks/base"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { userEvent, screen, renderWithBrowserRouter } from "@/testing/utils"; diff --git a/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/RemoveInterface/RemoveInterface.tsx b/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/RemoveInterface/RemoveInterface.tsx index 59cbae5d3db..6ea163a71c5 100644 --- a/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/RemoveInterface/RemoveInterface.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceNetwork/DeviceNetworkTable/RemoveInterface/RemoveInterface.tsx @@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; import { useCycled, useSendAnalyticsWhen } from "@/app/base/hooks"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { Device, diff --git a/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterface.test.tsx b/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterface.test.tsx index 23fee0aac5c..4438c7c068f 100644 --- a/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterface.test.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterface.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import EditInterface from "./EditInterface"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { DeviceNetworkInterface } from "@/app/store/device/types"; import { DeviceIpAssignment } from "@/app/store/device/types"; diff --git a/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterface.tsx b/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterface.tsx index 806a5840de5..e00978c724c 100644 --- a/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterface.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterface.tsx @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from "react-redux"; import InterfaceForm from "../InterfaceForm"; import { useCycled } from "@/app/base/hooks"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { Device, diff --git a/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterfaceTable/EditInterfaceTable.tsx b/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterfaceTable/EditInterfaceTable.tsx index f1c2e1c16a7..510ae4a753c 100644 --- a/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterfaceTable/EditInterfaceTable.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceNetwork/EditInterface/EditInterfaceTable/EditInterfaceTable.tsx @@ -14,7 +14,7 @@ import type { DeviceNetworkInterface, } from "@/app/store/device/types"; import { isDeviceDetails } from "@/app/store/device/utils"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { RootState } from "@/app/store/root/types"; import type { NetworkLink } from "@/app/store/types/node"; @@ -24,7 +24,7 @@ import { getLinkFromNic, getLinkModeDisplay, } from "@/app/store/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; type Props = { diff --git a/src/app/devices/views/DeviceDetails/DeviceNetwork/InterfaceForm/InterfaceForm.tsx b/src/app/devices/views/DeviceDetails/DeviceNetwork/InterfaceForm/InterfaceForm.tsx index 08fdeb62f9c..47b89f9c89f 100644 --- a/src/app/devices/views/DeviceDetails/DeviceNetwork/InterfaceForm/InterfaceForm.tsx +++ b/src/app/devices/views/DeviceDetails/DeviceNetwork/InterfaceForm/InterfaceForm.tsx @@ -9,7 +9,7 @@ import type { FormikFormProps } from "@/app/base/components/FormikForm"; import FormikForm from "@/app/base/components/FormikForm"; import { useFetchActions, useIsAllNetworkingDisabled } from "@/app/base/hooks"; import { MAC_ADDRESS_REGEX } from "@/app/base/validation"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { Device, @@ -18,10 +18,10 @@ import type { } from "@/app/store/device/types"; import { DeviceIpAssignment } from "@/app/store/device/types"; import { isDeviceDetails } from "@/app/store/device/utils"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet, SubnetMeta } from "@/app/store/subnet/types"; import { NetworkInterfaceTypes } from "@/app/store/types/enum"; @@ -31,7 +31,7 @@ import { getLinkFromNic, getNextNicName, } from "@/app/store/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; type Props = PropsWithSpread< diff --git a/src/app/devices/views/DeviceList/DeviceList.tsx b/src/app/devices/views/DeviceList/DeviceList.tsx index 49635748027..3da2597b7f0 100644 --- a/src/app/devices/views/DeviceList/DeviceList.tsx +++ b/src/app/devices/views/DeviceList/DeviceList.tsx @@ -11,11 +11,11 @@ import PageContent from "@/app/base/components/PageContent"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; import { useSidePanel } from "@/app/base/side-panel-context"; import DeviceHeaderForms from "@/app/devices/components/DeviceHeaderForms"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import { FilterDevices } from "@/app/store/device/utils"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import { getSidePanelTitle } from "@/app/store/utils/node/base"; const DeviceList = (): JSX.Element => { diff --git a/src/app/devices/views/DeviceList/DeviceListHeader/DeviceFilterAccordion/DeviceFilterAccordion.tsx b/src/app/devices/views/DeviceList/DeviceListHeader/DeviceFilterAccordion/DeviceFilterAccordion.tsx index 7a571886790..8150a746c3f 100644 --- a/src/app/devices/views/DeviceList/DeviceListHeader/DeviceFilterAccordion/DeviceFilterAccordion.tsx +++ b/src/app/devices/views/DeviceList/DeviceListHeader/DeviceFilterAccordion/DeviceFilterAccordion.tsx @@ -4,7 +4,7 @@ import FilterAccordion from "@/app/base/components/FilterAccordion"; import { useFetchActions } from "@/app/base/hooks"; import deviceSelectors from "@/app/store/device/selectors"; import { FilterDevices, getDeviceValue } from "@/app/store/device/utils"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; type Props = { diff --git a/src/app/domains/components/SetDefaultForm/SetDefaultForm.tsx b/src/app/domains/components/SetDefaultForm/SetDefaultForm.tsx index 3f352771a0d..7f81f9d3dc2 100644 --- a/src/app/domains/components/SetDefaultForm/SetDefaultForm.tsx +++ b/src/app/domains/components/SetDefaultForm/SetDefaultForm.tsx @@ -2,7 +2,7 @@ import { useDispatch, useSelector } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; import { Labels } from "@/app/domains/views/DomainsList/DomainsTable/DomainsTable"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; import type { Domain, DomainMeta } from "@/app/store/domain/types"; diff --git a/src/app/domains/views/DomainDetails/DomainDetails.tsx b/src/app/domains/views/DomainDetails/DomainDetails.tsx index 58686148421..9518764fb9f 100644 --- a/src/app/domains/views/DomainDetails/DomainDetails.tsx +++ b/src/app/domains/views/DomainDetails/DomainDetails.tsx @@ -16,7 +16,7 @@ import { useWindowTitle } from "@/app/base/hooks"; import { useGetURLId } from "@/app/base/hooks/urls"; import { useSidePanel } from "@/app/base/side-panel-context"; import urls from "@/app/base/urls"; -import { actions as domainsActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainsSelectors from "@/app/store/domain/selectors"; import { DomainMeta } from "@/app/store/domain/types"; import type { RootState } from "@/app/store/root/types"; @@ -35,13 +35,13 @@ const DomainDetails = (): JSX.Element => { useEffect(() => { if (isId(id)) { - dispatch(domainsActions.get(id)); + dispatch(domainActions.get(id)); // Set domain as active to ensure all domain data is sent from the server. - dispatch(domainsActions.setActive(id)); + dispatch(domainActions.setActive(id)); } // Unset active domain on cleanup. return () => { - dispatch(domainsActions.setActive(null)); + dispatch(domainActions.setActive(null)); }; }, [dispatch, id]); diff --git a/src/app/domains/views/DomainDetails/DomainDetailsHeader/AddRecordForm/AddRecordForm.tsx b/src/app/domains/views/DomainDetails/DomainDetailsHeader/AddRecordForm/AddRecordForm.tsx index 470eb7836ed..5104d78fd11 100644 --- a/src/app/domains/views/DomainDetails/DomainDetailsHeader/AddRecordForm/AddRecordForm.tsx +++ b/src/app/domains/views/DomainDetails/DomainDetailsHeader/AddRecordForm/AddRecordForm.tsx @@ -6,7 +6,7 @@ import type { SchemaOf } from "yup"; import FormikForm from "@/app/base/components/FormikForm"; import RecordFields from "@/app/domains/components/RecordFields"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import { MIN_TTL } from "@/app/store/domain/constants"; import domainSelectors from "@/app/store/domain/selectors"; import type { Domain, DomainResource } from "@/app/store/domain/types"; diff --git a/src/app/domains/views/DomainDetails/DomainDetailsHeader/DeleteDomainForm/DeleteDomainForm.tsx b/src/app/domains/views/DomainDetails/DomainDetailsHeader/DeleteDomainForm/DeleteDomainForm.tsx index cb6f7220ad1..039918d82b3 100644 --- a/src/app/domains/views/DomainDetails/DomainDetailsHeader/DeleteDomainForm/DeleteDomainForm.tsx +++ b/src/app/domains/views/DomainDetails/DomainDetailsHeader/DeleteDomainForm/DeleteDomainForm.tsx @@ -6,7 +6,7 @@ import { useDispatch, useSelector } from "react-redux"; import FormikForm from "@/app/base/components/FormikForm"; import type { EmptyObject } from "@/app/base/types"; import urls from "@/app/base/urls"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; import type { Domain } from "@/app/store/domain/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/domains/views/DomainDetails/DomainDetailsHeader/DomainDetailsHeader.tsx b/src/app/domains/views/DomainDetails/DomainDetailsHeader/DomainDetailsHeader.tsx index adfe754e12b..6d0f0bed42f 100644 --- a/src/app/domains/views/DomainDetails/DomainDetailsHeader/DomainDetailsHeader.tsx +++ b/src/app/domains/views/DomainDetails/DomainDetailsHeader/DomainDetailsHeader.tsx @@ -8,7 +8,7 @@ import { DomainDetailsSidePanelViews } from "../constants"; import SectionHeader from "@/app/base/components/SectionHeader"; import type { SetSidePanelContent } from "@/app/base/side-panel-context"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; import type { Domain } from "@/app/store/domain/types"; import { isDomainDetails } from "@/app/store/domain/utils"; diff --git a/src/app/domains/views/DomainDetails/DomainSummary/DomainSummary.tsx b/src/app/domains/views/DomainDetails/DomainSummary/DomainSummary.tsx index 2ea913f8551..38720fecb04 100644 --- a/src/app/domains/views/DomainDetails/DomainSummary/DomainSummary.tsx +++ b/src/app/domains/views/DomainDetails/DomainSummary/DomainSummary.tsx @@ -9,7 +9,7 @@ import EditableSection from "@/app/base/components/EditableSection"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import authSelectors from "@/app/store/auth/selectors"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import { MIN_TTL } from "@/app/store/domain/constants"; import domainsSelectors from "@/app/store/domain/selectors"; import type { Domain } from "@/app/store/domain/types"; diff --git a/src/app/domains/views/DomainDetails/ResourceRecords/DeleteRecordForm/DeleteRecordForm.test.tsx b/src/app/domains/views/DomainDetails/ResourceRecords/DeleteRecordForm/DeleteRecordForm.test.tsx index 727241c04d7..50afc2cc3b0 100644 --- a/src/app/domains/views/DomainDetails/ResourceRecords/DeleteRecordForm/DeleteRecordForm.test.tsx +++ b/src/app/domains/views/DomainDetails/ResourceRecords/DeleteRecordForm/DeleteRecordForm.test.tsx @@ -7,7 +7,7 @@ import DeleteRecordForm, { Labels as DeleteRecordFormLabels, } from "./DeleteRecordForm"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import * as factory from "@/testing/factories"; import { userEvent, diff --git a/src/app/domains/views/DomainDetails/ResourceRecords/DeleteRecordForm/DeleteRecordForm.tsx b/src/app/domains/views/DomainDetails/ResourceRecords/DeleteRecordForm/DeleteRecordForm.tsx index db7dbeff97f..6d0cce98178 100644 --- a/src/app/domains/views/DomainDetails/ResourceRecords/DeleteRecordForm/DeleteRecordForm.tsx +++ b/src/app/domains/views/DomainDetails/ResourceRecords/DeleteRecordForm/DeleteRecordForm.tsx @@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "react-redux"; import FormikForm from "@/app/base/components/FormikForm"; import type { EmptyObject } from "@/app/base/types"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; import type { Domain, DomainResource } from "@/app/store/domain/types"; import { isDomainDetails } from "@/app/store/domain/utils"; diff --git a/src/app/domains/views/DomainDetails/ResourceRecords/EditRecordForm/EditRecordForm.test.tsx b/src/app/domains/views/DomainDetails/ResourceRecords/EditRecordForm/EditRecordForm.test.tsx index 1d58defa4fa..3e77d8a6880 100644 --- a/src/app/domains/views/DomainDetails/ResourceRecords/EditRecordForm/EditRecordForm.test.tsx +++ b/src/app/domains/views/DomainDetails/ResourceRecords/EditRecordForm/EditRecordForm.test.tsx @@ -8,7 +8,7 @@ import EditRecordForm, { } from "./EditRecordForm"; import { Labels as RecordFieldsLabels } from "@/app/domains/components/RecordFields/RecordFields"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import { RecordType } from "@/app/store/domain/types"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/domains/views/DomainDetails/ResourceRecords/EditRecordForm/EditRecordForm.tsx b/src/app/domains/views/DomainDetails/ResourceRecords/EditRecordForm/EditRecordForm.tsx index 3b6e90b5d98..3887a104296 100644 --- a/src/app/domains/views/DomainDetails/ResourceRecords/EditRecordForm/EditRecordForm.tsx +++ b/src/app/domains/views/DomainDetails/ResourceRecords/EditRecordForm/EditRecordForm.tsx @@ -6,7 +6,7 @@ import type { SchemaOf } from "yup"; import FormikForm from "@/app/base/components/FormikForm"; import RecordFields from "@/app/domains/components/RecordFields"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import { MIN_TTL } from "@/app/store/domain/constants"; import domainSelectors from "@/app/store/domain/selectors"; import type { Domain, DomainResource } from "@/app/store/domain/types"; diff --git a/src/app/domains/views/DomainsList/DomainListHeader/DomainListHeader.tsx b/src/app/domains/views/DomainsList/DomainListHeader/DomainListHeader.tsx index eec50181cfa..49c6cfd428b 100644 --- a/src/app/domains/views/DomainsList/DomainListHeader/DomainListHeader.tsx +++ b/src/app/domains/views/DomainsList/DomainListHeader/DomainListHeader.tsx @@ -7,7 +7,7 @@ import { DomainListSidePanelViews } from "../constants"; import ModelListSubtitle from "@/app/base/components/ModelListSubtitle"; import { useFetchActions } from "@/app/base/hooks"; import type { SetSidePanelContent } from "@/app/base/side-panel-context"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; export enum Labels { diff --git a/src/app/domains/views/DomainsList/DomainListHeaderForm/DomainListHeaderForm.tsx b/src/app/domains/views/DomainsList/DomainListHeaderForm/DomainListHeaderForm.tsx index f2b8828e55e..b9082a81b6d 100644 --- a/src/app/domains/views/DomainsList/DomainListHeaderForm/DomainListHeaderForm.tsx +++ b/src/app/domains/views/DomainsList/DomainListHeaderForm/DomainListHeaderForm.tsx @@ -8,7 +8,7 @@ import type { SchemaOf } from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import { DOMAIN_NAME_REGEX } from "@/app/base/validation"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; import type { Domain } from "@/app/store/domain/types"; diff --git a/src/app/domains/views/DomainsList/DomainsList.tsx b/src/app/domains/views/DomainsList/DomainsList.tsx index 96e07e80b08..846d3219e10 100644 --- a/src/app/domains/views/DomainsList/DomainsList.tsx +++ b/src/app/domains/views/DomainsList/DomainsList.tsx @@ -7,17 +7,16 @@ import PageContent from "@/app/base/components/PageContent"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; import { useSidePanel } from "@/app/base/side-panel-context"; import DomainForm from "@/app/domains/components/DomainForm"; -import { actions } from "@/app/store/domain"; import domainsSelectors from "@/app/store/domain/selectors"; import { getSidePanelTitle } from "@/app/store/utils/node/base"; - +import { zoneActions } from "@/app/store/zone"; const DomainsList = (): JSX.Element => { const domains = useSelector(domainsSelectors.all); const { sidePanelContent, setSidePanelContent } = useSidePanel(); useWindowTitle("DNS"); - useFetchActions([actions.fetch]); + useFetchActions([zoneActions.fetch]); return ( { afterEach(() => { MockDate.reset(); + timezoneMock.unregister(); }); let state: RootState; diff --git a/src/app/images/views/ImageList/ImageList.tsx b/src/app/images/views/ImageList/ImageList.tsx index 27702af11c3..e755a6d0407 100644 --- a/src/app/images/views/ImageList/ImageList.tsx +++ b/src/app/images/views/ImageList/ImageList.tsx @@ -12,9 +12,9 @@ import PageContent from "@/app/base/components/PageContent"; import { useWindowTitle } from "@/app/base/hooks"; import { useSidePanel } from "@/app/base/side-panel-context"; import ImagesForms from "@/app/images/components/ImagesForms"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import bootResourceSelectors from "@/app/store/bootresource/selectors"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; import { getSidePanelTitle } from "@/app/store/utils/node/base"; diff --git a/src/app/images/views/ImageList/ImageListHeader/ImageListHeader.test.tsx b/src/app/images/views/ImageList/ImageListHeader/ImageListHeader.test.tsx index 777b5095101..2d7b26a8979 100644 --- a/src/app/images/views/ImageList/ImageListHeader/ImageListHeader.test.tsx +++ b/src/app/images/views/ImageList/ImageListHeader/ImageListHeader.test.tsx @@ -4,7 +4,7 @@ import ImageListHeader, { Labels as ImageListHeaderLabels, } from "./ImageListHeader"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import { ConfigNames } from "@/app/store/config/types"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/images/views/ImageList/ImageListHeader/ImageListHeader.tsx b/src/app/images/views/ImageList/ImageListHeader/ImageListHeader.tsx index 481e6a2285e..d2293a987d0 100644 --- a/src/app/images/views/ImageList/ImageListHeader/ImageListHeader.tsx +++ b/src/app/images/views/ImageList/ImageListHeader/ImageListHeader.tsx @@ -7,7 +7,7 @@ import TooltipButton from "@/app/base/components/TooltipButton"; import { useFetchActions, useCycled } from "@/app/base/hooks"; import bootResourceSelectors from "@/app/store/bootresource/selectors"; import type { BootResourceState } from "@/app/store/bootresource/types"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; export enum Labels { diff --git a/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchImagesForm/FetchImagesForm.test.tsx b/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchImagesForm/FetchImagesForm.test.tsx index 0912af8b70d..b5747001419 100644 --- a/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchImagesForm/FetchImagesForm.test.tsx +++ b/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchImagesForm/FetchImagesForm.test.tsx @@ -9,7 +9,7 @@ import FetchImagesForm, { } from "./FetchImagesForm"; import { Labels as FetchImagesFormFieldsLabels } from "./FetchImagesFormFields/FetchImagesFormFields"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import { BootResourceSourceType } from "@/app/store/bootresource/types"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchImagesForm/FetchImagesForm.tsx b/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchImagesForm/FetchImagesForm.tsx index 03e460feed4..30bc56a21ec 100644 --- a/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchImagesForm/FetchImagesForm.tsx +++ b/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchImagesForm/FetchImagesForm.tsx @@ -8,7 +8,7 @@ import FetchImagesFormFields from "./FetchImagesFormFields"; import FormikForm from "@/app/base/components/FormikForm"; import type { APIError } from "@/app/base/types"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import bootResourceSelectors from "@/app/store/bootresource/selectors"; import { BootResourceSourceType } from "@/app/store/bootresource/types"; import type { BootResourceUbuntuSource } from "@/app/store/bootresource/types"; diff --git a/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchedImages/FetchedImages.test.tsx b/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchedImages/FetchedImages.test.tsx index 7b77d9ae8f7..51d8af48bd0 100644 --- a/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchedImages/FetchedImages.test.tsx +++ b/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchedImages/FetchedImages.test.tsx @@ -6,7 +6,7 @@ import configureStore from "redux-mock-store"; import FetchedImages, { Labels as FetchedImagesLabels } from "./FetchedImages"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import { BootResourceSourceType } from "@/app/store/bootresource/types"; import { ConfigNames } from "@/app/store/config/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchedImages/FetchedImages.tsx b/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchedImages/FetchedImages.tsx index b6485438ffa..0987b98c674 100644 --- a/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchedImages/FetchedImages.tsx +++ b/src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchedImages/FetchedImages.tsx @@ -7,7 +7,7 @@ import * as Yup from "yup"; import FormikForm from "@/app/base/components/FormikForm"; import UbuntuImageSelect from "@/app/images/components/UbuntuImageSelect"; import type { ImageValue } from "@/app/images/types"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import bootResourceSelectors from "@/app/store/bootresource/selectors"; import type { BootResourceUbuntuSource, diff --git a/src/app/images/views/ImageList/SyncedImages/OtherImages/OtherImages.test.tsx b/src/app/images/views/ImageList/SyncedImages/OtherImages/OtherImages.test.tsx index 0a31263044a..24a75943de9 100644 --- a/src/app/images/views/ImageList/SyncedImages/OtherImages/OtherImages.test.tsx +++ b/src/app/images/views/ImageList/SyncedImages/OtherImages/OtherImages.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import OtherImages, { Labels as OtherImagesLabels } from "./OtherImages"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { diff --git a/src/app/images/views/ImageList/SyncedImages/OtherImages/OtherImages.tsx b/src/app/images/views/ImageList/SyncedImages/OtherImages/OtherImages.tsx index ab14773954e..10a27151427 100644 --- a/src/app/images/views/ImageList/SyncedImages/OtherImages/OtherImages.tsx +++ b/src/app/images/views/ImageList/SyncedImages/OtherImages/OtherImages.tsx @@ -8,7 +8,7 @@ import * as Yup from "yup"; import FormikForm from "@/app/base/components/FormikForm"; import NonUbuntuImageSelect from "@/app/images/components/NonUbuntuImageSelect"; import type { ImageValue } from "@/app/images/types"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import bootResourceSelectors from "@/app/store/bootresource/selectors"; import { BootResourceAction } from "@/app/store/bootresource/types"; import { diff --git a/src/app/images/views/ImageList/SyncedImages/UbuntuCoreImages/UbuntuCoreImages.test.tsx b/src/app/images/views/ImageList/SyncedImages/UbuntuCoreImages/UbuntuCoreImages.test.tsx index 93b7c31bd3c..f0129849277 100644 --- a/src/app/images/views/ImageList/SyncedImages/UbuntuCoreImages/UbuntuCoreImages.test.tsx +++ b/src/app/images/views/ImageList/SyncedImages/UbuntuCoreImages/UbuntuCoreImages.test.tsx @@ -7,7 +7,7 @@ import UbuntuCoreImages, { Labels as UbuntuCoreImagesLabels, } from "./UbuntuCoreImages"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { diff --git a/src/app/images/views/ImageList/SyncedImages/UbuntuCoreImages/UbuntuCoreImages.tsx b/src/app/images/views/ImageList/SyncedImages/UbuntuCoreImages/UbuntuCoreImages.tsx index 113c9d353c7..01a2730357e 100644 --- a/src/app/images/views/ImageList/SyncedImages/UbuntuCoreImages/UbuntuCoreImages.tsx +++ b/src/app/images/views/ImageList/SyncedImages/UbuntuCoreImages/UbuntuCoreImages.tsx @@ -8,7 +8,7 @@ import * as Yup from "yup"; import FormikForm from "@/app/base/components/FormikForm"; import NonUbuntuImageSelect from "@/app/images/components/NonUbuntuImageSelect"; import type { ImageValue } from "@/app/images/types"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import bootResourceSelectors from "@/app/store/bootresource/selectors"; import { BootResourceAction } from "@/app/store/bootresource/types"; import { diff --git a/src/app/images/views/ImageList/SyncedImages/UbuntuImages/UbuntuImages.test.tsx b/src/app/images/views/ImageList/SyncedImages/UbuntuImages/UbuntuImages.test.tsx index a2f9ef28bdb..1397bcf9fc5 100644 --- a/src/app/images/views/ImageList/SyncedImages/UbuntuImages/UbuntuImages.test.tsx +++ b/src/app/images/views/ImageList/SyncedImages/UbuntuImages/UbuntuImages.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import UbuntuImages, { Labels as UbuntuImagesLabels } from "./UbuntuImages"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import { BootResourceSourceType } from "@/app/store/bootresource/types"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/images/views/ImageList/SyncedImages/UbuntuImages/UbuntuImages.tsx b/src/app/images/views/ImageList/SyncedImages/UbuntuImages/UbuntuImages.tsx index 5716366ae63..1b7631f9ea8 100644 --- a/src/app/images/views/ImageList/SyncedImages/UbuntuImages/UbuntuImages.tsx +++ b/src/app/images/views/ImageList/SyncedImages/UbuntuImages/UbuntuImages.tsx @@ -8,7 +8,7 @@ import * as Yup from "yup"; import FormikForm from "@/app/base/components/FormikForm"; import UbuntuImageSelect from "@/app/images/components/UbuntuImageSelect"; import type { ImageValue } from "@/app/images/types"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import bootResourceSelectors from "@/app/store/bootresource/selectors"; import type { BootResourceUbuntuSource, diff --git a/src/app/intro/views/ImagesIntro/ImagesIntro.tsx b/src/app/intro/views/ImagesIntro/ImagesIntro.tsx index 60919d65533..55b291caf18 100644 --- a/src/app/intro/views/ImagesIntro/ImagesIntro.tsx +++ b/src/app/intro/views/ImagesIntro/ImagesIntro.tsx @@ -8,7 +8,7 @@ import urls from "@/app/base/urls"; import SyncedImages from "@/app/images/views/ImageList/SyncedImages"; import IntroCard from "@/app/intro/components/IntroCard"; import IntroSection from "@/app/intro/components/IntroSection"; -import { actions as bootResourceActions } from "@/app/store/bootresource"; +import { bootResourceActions } from "@/app/store/bootresource"; import bootResourceSelectors from "@/app/store/bootresource/selectors"; export enum Labels { diff --git a/src/app/intro/views/MaasIntro/MaasIntro.test.tsx b/src/app/intro/views/MaasIntro/MaasIntro.test.tsx index 7808c591107..1413eba51e6 100644 --- a/src/app/intro/views/MaasIntro/MaasIntro.test.tsx +++ b/src/app/intro/views/MaasIntro/MaasIntro.test.tsx @@ -6,9 +6,9 @@ import { Labels as ConnectivityCardLabels } from "./ConnectivityCard/Connectivit import MaasIntro, { Labels as MaasIntroLabels } from "./MaasIntro"; import { Labels as NameCardLabels } from "./NameCard/NameCard"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import { ConfigNames } from "@/app/store/config/types"; -import { actions as repoActions } from "@/app/store/packagerepository"; +import { repositoryActions } from "@/app/store/packagerepository"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { @@ -101,7 +101,7 @@ describe("MaasIntro", () => { maas_name: "my new maas", upstream_dns: "0.0.0.0", }); - const updateRepoAction = repoActions.update(mainArchive); + const updateRepoAction = repositoryActions.update(mainArchive); expect( store .getActions() @@ -154,12 +154,12 @@ describe("MaasIntro", () => { screen.getByRole("button", { name: MaasIntroLabels.SubmitLabel }) ); - const updateMainArchiveAction = repoActions.update({ + const updateMainArchiveAction = repositoryActions.update({ id: mainArchive.id, name: mainArchive.name, url: "http://www.newmainarchive.com", }); - const updatePortsArchiveAction = repoActions.update({ + const updatePortsArchiveAction = repositoryActions.update({ id: portsArchive.id, name: portsArchive.name, url: "http://www.newportsarchive.com", diff --git a/src/app/intro/views/MaasIntro/MaasIntro.tsx b/src/app/intro/views/MaasIntro/MaasIntro.tsx index 25494f6d031..f2e60dfeda4 100644 --- a/src/app/intro/views/MaasIntro/MaasIntro.tsx +++ b/src/app/intro/views/MaasIntro/MaasIntro.tsx @@ -17,9 +17,9 @@ import { UrlSchema } from "@/app/base/validation"; import IntroSection from "@/app/intro/components/IntroSection"; import { useExitURL } from "@/app/intro/hooks"; import authSelectors from "@/app/store/auth/selectors"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; -import { actions as repoActions } from "@/app/store/packagerepository"; +import { repositoryActions } from "@/app/store/packagerepository"; import repoSelectors from "@/app/store/packagerepository/selectors"; export enum Labels { @@ -61,7 +61,7 @@ const MaasIntro = (): JSX.Element => { const [showSkip, setShowSkip] = useState(false); const exitURL = useExitURL(); - useFetchActions([repoActions.fetch]); + useFetchActions([repositoryActions.fetch]); const errors = { ...(configErrors && typeof configErrors === "object" ? configErrors : {}), @@ -93,7 +93,7 @@ const MaasIntro = (): JSX.Element => { }} onSubmit={(values) => { dispatch(configActions.cleanup()); - dispatch(repoActions.cleanup()); + dispatch(repositoryActions.cleanup()); dispatch( configActions.update({ http_proxy: values.httpProxy, @@ -103,7 +103,7 @@ const MaasIntro = (): JSX.Element => { ); if (mainArchive && mainArchive.url !== values.mainArchiveUrl) { dispatch( - repoActions.update({ + repositoryActions.update({ id: mainArchive.id, name: mainArchive.name, url: values.mainArchiveUrl, @@ -112,7 +112,7 @@ const MaasIntro = (): JSX.Element => { } if (portsArchive && portsArchive.url !== values.portsArchiveUrl) { dispatch( - repoActions.update({ + repositoryActions.update({ id: portsArchive.id, name: portsArchive.name, url: values.portsArchiveUrl, diff --git a/src/app/intro/views/MaasIntroSuccess/MaasIntroSuccess.test.tsx b/src/app/intro/views/MaasIntroSuccess/MaasIntroSuccess.test.tsx index d40c5b38913..70c1e6137d9 100644 --- a/src/app/intro/views/MaasIntroSuccess/MaasIntroSuccess.test.tsx +++ b/src/app/intro/views/MaasIntroSuccess/MaasIntroSuccess.test.tsx @@ -7,7 +7,7 @@ import MaasIntroSuccess, { } from "./MaasIntroSuccess"; import urls from "@/app/base/urls"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import { ConfigNames } from "@/app/store/config/types"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/intro/views/MaasIntroSuccess/MaasIntroSuccess.tsx b/src/app/intro/views/MaasIntroSuccess/MaasIntroSuccess.tsx index 0782ed3a55f..90a44225e03 100644 --- a/src/app/intro/views/MaasIntroSuccess/MaasIntroSuccess.tsx +++ b/src/app/intro/views/MaasIntroSuccess/MaasIntroSuccess.tsx @@ -7,7 +7,7 @@ import IntroCard from "@/app/intro/components/IntroCard"; import IntroSection from "@/app/intro/components/IntroSection"; import { useExitURL } from "@/app/intro/hooks"; import authSelectors from "@/app/store/auth/selectors"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; export enum Labels { FinishSetup = "Finish setup", diff --git a/src/app/intro/views/UserIntro/UserIntro.test.tsx b/src/app/intro/views/UserIntro/UserIntro.test.tsx index 34db7cac164..c30d6a888d8 100644 --- a/src/app/intro/views/UserIntro/UserIntro.test.tsx +++ b/src/app/intro/views/UserIntro/UserIntro.test.tsx @@ -8,7 +8,7 @@ import UserIntro, { Labels as UserIntroLabels } from "./UserIntro"; import * as baseHooks from "@/app/base/hooks/base"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as userActions } from "@/app/store/user"; +import { userActions } from "@/app/store/user"; import * as factory from "@/testing/factories"; import { userEvent, diff --git a/src/app/intro/views/UserIntro/UserIntro.tsx b/src/app/intro/views/UserIntro/UserIntro.tsx index ddfea35ae7d..5cc167beb7c 100644 --- a/src/app/intro/views/UserIntro/UserIntro.tsx +++ b/src/app/intro/views/UserIntro/UserIntro.tsx @@ -10,9 +10,9 @@ import { useFetchActions, useCycled } from "@/app/base/hooks"; import IntroCard from "@/app/intro/components/IntroCard"; import IntroSection from "@/app/intro/components/IntroSection"; import authSelectors from "@/app/store/auth/selectors"; -import { actions as sshkeyActions } from "@/app/store/sshkey"; +import { sshkeyActions } from "@/app/store/sshkey"; import sshkeySelectors from "@/app/store/sshkey/selectors"; -import { actions as userActions } from "@/app/store/user"; +import { userActions } from "@/app/store/user"; import userSelectors from "@/app/store/user/selectors"; import { formatErrors } from "@/app/utils"; diff --git a/src/app/kvm/components/KVMConfigurationCard/KVMConfigurationCard.test.tsx b/src/app/kvm/components/KVMConfigurationCard/KVMConfigurationCard.test.tsx index 53ae5cdb870..e4926132011 100644 --- a/src/app/kvm/components/KVMConfigurationCard/KVMConfigurationCard.test.tsx +++ b/src/app/kvm/components/KVMConfigurationCard/KVMConfigurationCard.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import KVMConfigurationCard from "./KVMConfigurationCard"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/kvm/components/KVMConfigurationCard/KVMConfigurationCard.tsx b/src/app/kvm/components/KVMConfigurationCard/KVMConfigurationCard.tsx index 7ab3e37b38b..53294c2c107 100644 --- a/src/app/kvm/components/KVMConfigurationCard/KVMConfigurationCard.tsx +++ b/src/app/kvm/components/KVMConfigurationCard/KVMConfigurationCard.tsx @@ -7,7 +7,7 @@ import KVMConfigurationCardFields from "./KVMConfigurationCardFields"; import FormCard from "@/app/base/components/FormCard"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import podSelectors from "@/app/store/pod/selectors"; import type { diff --git a/src/app/kvm/components/KVMForms/AddLxd/AddLxd.test.tsx b/src/app/kvm/components/KVMForms/AddLxd/AddLxd.test.tsx index 9fd6763f60f..e9cbafc66e1 100644 --- a/src/app/kvm/components/KVMForms/AddLxd/AddLxd.test.tsx +++ b/src/app/kvm/components/KVMForms/AddLxd/AddLxd.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import AddLxd from "./AddLxd"; import { ConfigNames } from "@/app/store/config/types"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/kvm/components/KVMForms/AddLxd/AddLxd.tsx b/src/app/kvm/components/KVMForms/AddLxd/AddLxd.tsx index bca87d65974..177e95fc208 100644 --- a/src/app/kvm/components/KVMForms/AddLxd/AddLxd.tsx +++ b/src/app/kvm/components/KVMForms/AddLxd/AddLxd.tsx @@ -10,7 +10,7 @@ import SelectProjectForm from "./SelectProjectForm"; import type { AddLxdStepValues, NewPodValues } from "./types"; import type { ClearSidePanelContent } from "@/app/base/types"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; import zoneSelectors from "@/app/store/zone/selectors"; diff --git a/src/app/kvm/components/KVMForms/AddLxd/AuthenticationForm/AuthenticationForm.test.tsx b/src/app/kvm/components/KVMForms/AddLxd/AuthenticationForm/AuthenticationForm.test.tsx index fdf7dc2944a..c3897d3f5a3 100644 --- a/src/app/kvm/components/KVMForms/AddLxd/AuthenticationForm/AuthenticationForm.test.tsx +++ b/src/app/kvm/components/KVMForms/AddLxd/AuthenticationForm/AuthenticationForm.test.tsx @@ -5,8 +5,8 @@ import type { NewPodValues } from "../types"; import AuthenticationForm from "./AuthenticationForm"; -import { actions as generalActions } from "@/app/store/general"; -import { actions as podActions } from "@/app/store/pod"; +import { generalActions } from "@/app/store/general"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/kvm/components/KVMForms/AddLxd/AuthenticationForm/AuthenticationForm.tsx b/src/app/kvm/components/KVMForms/AddLxd/AuthenticationForm/AuthenticationForm.tsx index a51cb13c2a6..e8f3512a96f 100644 --- a/src/app/kvm/components/KVMForms/AddLxd/AuthenticationForm/AuthenticationForm.tsx +++ b/src/app/kvm/components/KVMForms/AddLxd/AuthenticationForm/AuthenticationForm.tsx @@ -12,9 +12,9 @@ import AuthenticationFormFields from "./AuthenticationFormFields"; import FormikForm from "@/app/base/components/FormikForm"; import type { ClearSidePanelContent } from "@/app/base/types"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { generatedCertificate as generatedCertificateSelectors } from "@/app/store/general/selectors"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import podSelectors from "@/app/store/pod/selectors"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/kvm/components/KVMForms/AddLxd/CredentialsForm/CredentialsForm.test.tsx b/src/app/kvm/components/KVMForms/AddLxd/CredentialsForm/CredentialsForm.test.tsx index 467ea0cd1a6..ff954134118 100644 --- a/src/app/kvm/components/KVMForms/AddLxd/CredentialsForm/CredentialsForm.test.tsx +++ b/src/app/kvm/components/KVMForms/AddLxd/CredentialsForm/CredentialsForm.test.tsx @@ -5,8 +5,8 @@ import type { NewPodValues } from "../types"; import CredentialsForm from "./CredentialsForm"; -import { actions as generalActions } from "@/app/store/general"; -import { actions as podActions } from "@/app/store/pod"; +import { generalActions } from "@/app/store/general"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/kvm/components/KVMForms/AddLxd/CredentialsForm/CredentialsForm.tsx b/src/app/kvm/components/KVMForms/AddLxd/CredentialsForm/CredentialsForm.tsx index c3bbaa0ec7b..2c3837ab60a 100644 --- a/src/app/kvm/components/KVMForms/AddLxd/CredentialsForm/CredentialsForm.tsx +++ b/src/app/kvm/components/KVMForms/AddLxd/CredentialsForm/CredentialsForm.tsx @@ -14,10 +14,10 @@ import CredentialsFormFields from "./CredentialsFormFields"; import FormikForm from "@/app/base/components/FormikForm"; import type { ClearSidePanelContent } from "@/app/base/types"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { generatedCertificate as generatedCertificateSelectors } from "@/app/store/general/selectors"; import { splitCertificateName } from "@/app/store/general/utils"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import podSelectors from "@/app/store/pod/selectors"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/kvm/components/KVMForms/AddLxd/SelectProjectForm/SelectProjectForm.test.tsx b/src/app/kvm/components/KVMForms/AddLxd/SelectProjectForm/SelectProjectForm.test.tsx index de77060a11c..b54cc6bbe54 100644 --- a/src/app/kvm/components/KVMForms/AddLxd/SelectProjectForm/SelectProjectForm.test.tsx +++ b/src/app/kvm/components/KVMForms/AddLxd/SelectProjectForm/SelectProjectForm.test.tsx @@ -5,7 +5,7 @@ import type { NewPodValues } from "../types"; import SelectProjectForm from "./SelectProjectForm"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/kvm/components/KVMForms/AddLxd/SelectProjectForm/SelectProjectForm.tsx b/src/app/kvm/components/KVMForms/AddLxd/SelectProjectForm/SelectProjectForm.tsx index 1544b8dd863..6f1fbcbcd44 100644 --- a/src/app/kvm/components/KVMForms/AddLxd/SelectProjectForm/SelectProjectForm.tsx +++ b/src/app/kvm/components/KVMForms/AddLxd/SelectProjectForm/SelectProjectForm.tsx @@ -16,7 +16,7 @@ import SelectProjectFormFields from "./SelectProjectFormFields"; import FormikForm from "@/app/base/components/FormikForm"; import { useAddMessage } from "@/app/base/hooks"; import type { ClearSidePanelContent } from "@/app/base/types"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import podSelectors from "@/app/store/pod/selectors"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/kvm/components/KVMForms/AddVirsh/AddVirsh.test.tsx b/src/app/kvm/components/KVMForms/AddVirsh/AddVirsh.test.tsx index 850cc624a9a..ba16b0ebb56 100644 --- a/src/app/kvm/components/KVMForms/AddVirsh/AddVirsh.test.tsx +++ b/src/app/kvm/components/KVMForms/AddVirsh/AddVirsh.test.tsx @@ -3,11 +3,11 @@ import configureStore from "redux-mock-store"; import AddVirsh from "./AddVirsh"; import { ConfigNames } from "@/app/store/config/types"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { PodType } from "@/app/store/pod/constants"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import type { RootState } from "@/app/store/root/types"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import * as factory from "@/testing/factories"; import { renderWithBrowserRouter, screen, userEvent } from "@/testing/utils"; diff --git a/src/app/kvm/components/KVMForms/AddVirsh/AddVirsh.tsx b/src/app/kvm/components/KVMForms/AddVirsh/AddVirsh.tsx index e508353506e..962bf4d6d79 100644 --- a/src/app/kvm/components/KVMForms/AddVirsh/AddVirsh.tsx +++ b/src/app/kvm/components/KVMForms/AddVirsh/AddVirsh.tsx @@ -10,7 +10,7 @@ import AddVirshFields from "./AddVirshFields"; import FormikForm from "@/app/base/components/FormikForm"; import { useFetchActions, useAddMessage } from "@/app/base/hooks"; import type { ClearSidePanelContent } from "@/app/base/types"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { powerTypes as powerTypesSelectors } from "@/app/store/general/selectors"; import { PowerFieldScope } from "@/app/store/general/types"; import { @@ -18,14 +18,14 @@ import { generatePowerParametersSchema, useInitialPowerParameters, } from "@/app/store/general/utils"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod } from "@/app/store/pod/types"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; import type { PowerParameters } from "@/app/store/types/node"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; type Props = { diff --git a/src/app/kvm/components/KVMForms/ComposeForm/ComposeForm.tsx b/src/app/kvm/components/KVMForms/ComposeForm/ComposeForm.tsx index de8660b0927..5e6fdb2bfd0 100644 --- a/src/app/kvm/components/KVMForms/ComposeForm/ComposeForm.tsx +++ b/src/app/kvm/components/KVMForms/ComposeForm/ComposeForm.tsx @@ -18,15 +18,15 @@ import ActionForm from "@/app/base/components/ActionForm"; import type { ClearSidePanelContent } from "@/app/base/types"; import { hostnameValidation, RANGE_REGEX } from "@/app/base/validation"; import { useActivePod } from "@/app/kvm/hooks"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { powerTypes as powerTypesSelectors } from "@/app/store/general/selectors"; -import { actions as machineActions } from "@/app/store/machine"; -import { actions as messageActions } from "@/app/store/message"; -import { actions as podActions } from "@/app/store/pod"; +import { machineActions } from "@/app/store/machine"; +import { messageActions } from "@/app/store/message"; +import { podActions } from "@/app/store/pod"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod } from "@/app/store/pod/types"; import { @@ -34,19 +34,19 @@ import { isPodDetails, resourceWithOverCommit, } from "@/app/store/pod/utils"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; import type { ResourcePool } from "@/app/store/resourcepool/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import spaceSelectors from "@/app/store/space/selectors"; import type { Space } from "@/app/store/space/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; import { arrayFromRangesString, getRanges } from "@/app/utils"; diff --git a/src/app/kvm/components/KVMForms/DeleteForm/DeleteForm.tsx b/src/app/kvm/components/KVMForms/DeleteForm/DeleteForm.tsx index 4b322cfc206..c72ee942d66 100644 --- a/src/app/kvm/components/KVMForms/DeleteForm/DeleteForm.tsx +++ b/src/app/kvm/components/KVMForms/DeleteForm/DeleteForm.tsx @@ -9,14 +9,14 @@ import ActionForm from "@/app/base/components/ActionForm"; import FormikField from "@/app/base/components/FormikField"; import type { ClearSidePanelContent } from "@/app/base/types"; import urls from "@/app/base/urls"; -import { actions as machineActions } from "@/app/store/machine"; -import { actions as messageActions } from "@/app/store/message"; -import { actions as podActions } from "@/app/store/pod"; +import { machineActions } from "@/app/store/machine"; +import { messageActions } from "@/app/store/message"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod, PodMeta } from "@/app/store/pod/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as vmClusterActions } from "@/app/store/vmcluster"; +import { vmClusterActions } from "@/app/store/vmcluster"; import vmClusterSelectors from "@/app/store/vmcluster/selectors"; import type { VMCluster, VMClusterMeta } from "@/app/store/vmcluster/types"; diff --git a/src/app/kvm/components/KVMForms/RefreshForm/RefreshForm.tsx b/src/app/kvm/components/KVMForms/RefreshForm/RefreshForm.tsx index 012f18bb736..77aa5f38e13 100644 --- a/src/app/kvm/components/KVMForms/RefreshForm/RefreshForm.tsx +++ b/src/app/kvm/components/KVMForms/RefreshForm/RefreshForm.tsx @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from "react-redux"; import ActionForm from "@/app/base/components/ActionForm"; import type { ClearSidePanelContent, EmptyObject } from "@/app/base/types"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod } from "@/app/store/pod/types"; diff --git a/src/app/kvm/components/LXDHostToolbar/LXDHostToolbar.tsx b/src/app/kvm/components/LXDHostToolbar/LXDHostToolbar.tsx index 6bc9fc0aa80..d48dbb70bc1 100644 --- a/src/app/kvm/components/LXDHostToolbar/LXDHostToolbar.tsx +++ b/src/app/kvm/components/LXDHostToolbar/LXDHostToolbar.tsx @@ -9,7 +9,7 @@ import urls from "@/app/base/urls"; import type { KVMSetSidePanelContent } from "@/app/kvm/types"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod } from "@/app/store/pod/types"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; import type { RootState } from "@/app/store/root/types"; import type { VMCluster } from "@/app/store/vmcluster/types"; diff --git a/src/app/kvm/components/LXDHostVMs/LXDHostVMs.test.tsx b/src/app/kvm/components/LXDHostVMs/LXDHostVMs.test.tsx index b4e3f23a24f..61213e79e5c 100644 --- a/src/app/kvm/components/LXDHostVMs/LXDHostVMs.test.tsx +++ b/src/app/kvm/components/LXDHostVMs/LXDHostVMs.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import LXDHostVMs from "./LXDHostVMs"; import { KVMSidePanelViews } from "@/app/kvm/constants"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { renderWithBrowserRouter, screen, userEvent } from "@/testing/utils"; diff --git a/src/app/kvm/components/LXDHostVMs/NumaResources/NumaResourcesCard/NumaResourcesCard.test.tsx b/src/app/kvm/components/LXDHostVMs/NumaResources/NumaResourcesCard/NumaResourcesCard.test.tsx index 386bf1d1bc4..624f295fc18 100644 --- a/src/app/kvm/components/LXDHostVMs/NumaResources/NumaResourcesCard/NumaResourcesCard.test.tsx +++ b/src/app/kvm/components/LXDHostVMs/NumaResources/NumaResourcesCard/NumaResourcesCard.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import NumaResourcesCard from "./NumaResourcesCard"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { renderWithMockStore, screen, within } from "@/testing/utils"; diff --git a/src/app/kvm/components/LXDVMsTable/LXDVMsTable.test.tsx b/src/app/kvm/components/LXDVMsTable/LXDVMsTable.test.tsx index 230fba559c7..423a69abbfb 100644 --- a/src/app/kvm/components/LXDVMsTable/LXDVMsTable.test.tsx +++ b/src/app/kvm/components/LXDVMsTable/LXDVMsTable.test.tsx @@ -4,7 +4,7 @@ import configureStore from "redux-mock-store"; import LXDVMsTable from "./LXDVMsTable"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { FetchSortDirection, FetchGroupKey } from "@/app/store/machine/types"; import { generateCallId } from "@/app/store/machine/utils/query"; import * as factory from "@/testing/factories"; diff --git a/src/app/kvm/components/LXDVMsTable/LXDVMsTable.tsx b/src/app/kvm/components/LXDVMsTable/LXDVMsTable.tsx index fb990d0ac26..9dd780375e3 100644 --- a/src/app/kvm/components/LXDVMsTable/LXDVMsTable.tsx +++ b/src/app/kvm/components/LXDVMsTable/LXDVMsTable.tsx @@ -11,7 +11,7 @@ import type { GetHostColumn, GetResources } from "./VMsTable/VMsTable"; import type { SetSearchFilter, SortDirection } from "@/app/base/types"; import type { KVMSetSidePanelContent } from "@/app/kvm/types"; import { DEFAULTS } from "@/app/machines/views/MachineList/MachineListTable/constants"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { FetchGroupKey } from "@/app/store/machine/types"; import { FilterGroupKey } from "@/app/store/machine/types"; import { FilterMachines, useFetchedCount } from "@/app/store/machine/utils"; diff --git a/src/app/kvm/components/VmResources/VmResources.test.tsx b/src/app/kvm/components/VmResources/VmResources.test.tsx index 853438ee03d..57024ec56ff 100644 --- a/src/app/kvm/components/VmResources/VmResources.test.tsx +++ b/src/app/kvm/components/VmResources/VmResources.test.tsx @@ -4,7 +4,7 @@ import configureStore from "redux-mock-store"; import VmResources, { Label } from "./VmResources"; import { Label as MachineListLabel } from "@/app/machines/views/MachineList/MachineListTable/MachineListTable"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as query from "@/app/store/machine/utils/query"; import { PodType } from "@/app/store/pod/constants"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/kvm/hooks.test.tsx b/src/app/kvm/hooks.test.tsx index 75a2f7b2f68..2fd82eb01a9 100644 --- a/src/app/kvm/hooks.test.tsx +++ b/src/app/kvm/hooks.test.tsx @@ -10,7 +10,7 @@ import type { MockStoreEnhanced } from "redux-mock-store"; import { useActivePod, useKVMDetailsRedirect } from "./hooks"; import urls from "@/app/base/urls"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import * as factory from "@/testing/factories"; diff --git a/src/app/kvm/hooks.tsx b/src/app/kvm/hooks.tsx index e0e640ef581..06a295adc04 100644 --- a/src/app/kvm/hooks.tsx +++ b/src/app/kvm/hooks.tsx @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from "react-redux"; import { useLocation } from "react-router-dom-v5-compat"; import urls from "@/app/base/urls"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import { PodType } from "@/app/store/pod/constants"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod } from "@/app/store/pod/types"; diff --git a/src/app/kvm/views/KVMList/KVMList.tsx b/src/app/kvm/views/KVMList/KVMList.tsx index 4897c42bbbb..11d486aada3 100644 --- a/src/app/kvm/views/KVMList/KVMList.tsx +++ b/src/app/kvm/views/KVMList/KVMList.tsx @@ -15,12 +15,12 @@ import { useSidePanel } from "@/app/base/side-panel-context"; import urls from "@/app/base/urls"; import KVMForms from "@/app/kvm/components/KVMForms"; import { getFormTitle } from "@/app/kvm/utils"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import podSelectors from "@/app/store/pod/selectors"; -import { actions as poolActions } from "@/app/store/resourcepool"; -import { actions as vmclusterActions } from "@/app/store/vmcluster"; +import { resourcePoolActions } from "@/app/store/resourcepool"; +import { vmClusterActions } from "@/app/store/vmcluster"; import vmclusterSelectors from "@/app/store/vmcluster/selectors"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; export enum Label { Title = "KVM list", @@ -44,8 +44,8 @@ const KVMList = (): JSX.Element => { useFetchActions([ podActions.fetch, - poolActions.fetch, - vmclusterActions.fetch, + resourcePoolActions.fetch, + vmClusterActions.fetch, zoneActions.fetch, ]); diff --git a/src/app/kvm/views/KVMList/KVMListHeader/KVMListHeader.tsx b/src/app/kvm/views/KVMList/KVMListHeader/KVMListHeader.tsx index d1f43c4168d..b11927bfa03 100644 --- a/src/app/kvm/views/KVMList/KVMListHeader/KVMListHeader.tsx +++ b/src/app/kvm/views/KVMList/KVMListHeader/KVMListHeader.tsx @@ -9,7 +9,7 @@ import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import { KVMSidePanelViews } from "@/app/kvm/constants"; import type { KVMSetSidePanelContent } from "@/app/kvm/types"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import podSelectors from "@/app/store/pod/selectors"; type Props = Required> & { diff --git a/src/app/kvm/views/LXDClusterDetails/LXDClusterDetails.tsx b/src/app/kvm/views/LXDClusterDetails/LXDClusterDetails.tsx index 49f7e48f85c..dc3701a0382 100644 --- a/src/app/kvm/views/LXDClusterDetails/LXDClusterDetails.tsx +++ b/src/app/kvm/views/LXDClusterDetails/LXDClusterDetails.tsx @@ -27,9 +27,9 @@ import urls from "@/app/base/urls"; import KVMForms from "@/app/kvm/components/KVMForms/KVMForms"; import { getFormTitle } from "@/app/kvm/utils"; import { FilterMachines } from "@/app/store/machine/utils"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import type { RootState } from "@/app/store/root/types"; -import { actions as vmClusterActions } from "@/app/store/vmcluster"; +import { vmClusterActions } from "@/app/store/vmcluster"; import vmClusterSelectors from "@/app/store/vmcluster/selectors"; import { VMClusterMeta } from "@/app/store/vmcluster/types"; import { getRelativeRoute, isId } from "@/app/utils"; diff --git a/src/app/kvm/views/LXDClusterDetails/LXDClusterDetailsHeader/LXDClusterDetailsHeader.tsx b/src/app/kvm/views/LXDClusterDetails/LXDClusterDetailsHeader/LXDClusterDetailsHeader.tsx index c072ae33ee8..33b7603033c 100644 --- a/src/app/kvm/views/LXDClusterDetails/LXDClusterDetailsHeader/LXDClusterDetailsHeader.tsx +++ b/src/app/kvm/views/LXDClusterDetails/LXDClusterDetailsHeader/LXDClusterDetailsHeader.tsx @@ -14,7 +14,7 @@ import type { KVMSetSidePanelContent } from "@/app/kvm/types"; import type { RootState } from "@/app/store/root/types"; import vmClusterSelectors from "@/app/store/vmcluster/selectors"; import type { VMCluster } from "@/app/store/vmcluster/types"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; type Props = { diff --git a/src/app/kvm/views/LXDClusterDetails/LXDClusterHosts/LXDClusterHosts.tsx b/src/app/kvm/views/LXDClusterDetails/LXDClusterHosts/LXDClusterHosts.tsx index a8501fcf85b..e3b895dc3e4 100644 --- a/src/app/kvm/views/LXDClusterDetails/LXDClusterHosts/LXDClusterHosts.tsx +++ b/src/app/kvm/views/LXDClusterDetails/LXDClusterHosts/LXDClusterHosts.tsx @@ -15,7 +15,7 @@ import type { KVMSetSidePanelContent } from "@/app/kvm/types"; import { FilterMachines } from "@/app/store/machine/utils"; import podSelectors from "@/app/store/pod/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import vmClusterSelectors from "@/app/store/vmcluster/selectors"; import type { VMCluster } from "@/app/store/vmcluster/types"; diff --git a/src/app/kvm/views/LXDClusterDetails/LXDClusterHosts/LXDClusterHostsTable/LXDClusterHostsTable.tsx b/src/app/kvm/views/LXDClusterDetails/LXDClusterHosts/LXDClusterHostsTable/LXDClusterHostsTable.tsx index 5effeb3c48e..4823c120bab 100644 --- a/src/app/kvm/views/LXDClusterDetails/LXDClusterHosts/LXDClusterHostsTable/LXDClusterHostsTable.tsx +++ b/src/app/kvm/views/LXDClusterDetails/LXDClusterHosts/LXDClusterHostsTable/LXDClusterHostsTable.tsx @@ -26,7 +26,7 @@ import { KVMSidePanelViews } from "@/app/kvm/constants"; import type { KVMSetSidePanelContent } from "@/app/kvm/types"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod } from "@/app/store/pod/types"; -import { actions as poolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import poolSelectors from "@/app/store/resourcepool/selectors"; import type { ResourcePool } from "@/app/store/resourcepool/types"; import type { VMCluster } from "@/app/store/vmcluster/types"; @@ -196,7 +196,7 @@ const LXDClusterHostsTable = ({ currentPage * VMS_PER_PAGE ); - useFetchActions([poolActions.fetch]); + useFetchActions([resourcePoolActions.fetch]); return ( <> diff --git a/src/app/kvm/views/LXDClusterDetails/LXDClusterSettings/LXDClusterSettings.test.tsx b/src/app/kvm/views/LXDClusterDetails/LXDClusterSettings/LXDClusterSettings.test.tsx index eece37d1149..998acc9f558 100644 --- a/src/app/kvm/views/LXDClusterDetails/LXDClusterSettings/LXDClusterSettings.test.tsx +++ b/src/app/kvm/views/LXDClusterDetails/LXDClusterSettings/LXDClusterSettings.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import LXDClusterSettings from "./LXDClusterSettings"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import * as factory from "@/testing/factories"; import { render } from "@/testing/utils"; diff --git a/src/app/kvm/views/LXDClusterDetails/LXDClusterVMs/LXDClusterVMs.test.tsx b/src/app/kvm/views/LXDClusterDetails/LXDClusterVMs/LXDClusterVMs.test.tsx index f3e26e0348f..d82a9b897d4 100644 --- a/src/app/kvm/views/LXDClusterDetails/LXDClusterVMs/LXDClusterVMs.test.tsx +++ b/src/app/kvm/views/LXDClusterDetails/LXDClusterVMs/LXDClusterVMs.test.tsx @@ -4,7 +4,7 @@ import configureStore from "redux-mock-store"; import LXDClusterVMs from "./LXDClusterVMs"; import urls from "@/app/base/urls"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/kvm/views/LXDSingleDetails/LXDSingleDetailsHeader/LXDSingleDetailsHeader.tsx b/src/app/kvm/views/LXDSingleDetails/LXDSingleDetailsHeader/LXDSingleDetailsHeader.tsx index aab31406805..e073b20a357 100644 --- a/src/app/kvm/views/LXDSingleDetails/LXDSingleDetailsHeader/LXDSingleDetailsHeader.tsx +++ b/src/app/kvm/views/LXDSingleDetails/LXDSingleDetailsHeader/LXDSingleDetailsHeader.tsx @@ -10,11 +10,11 @@ import urls from "@/app/base/urls"; import KVMDetailsHeader from "@/app/kvm/components/KVMDetailsHeader"; import { KVMSidePanelViews } from "@/app/kvm/constants"; import type { KVMSetSidePanelContent } from "@/app/kvm/types"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod } from "@/app/store/pod/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; type Props = { diff --git a/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/AuthenticationCard/UpdateCertificate/UpdateCertificate.test.tsx b/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/AuthenticationCard/UpdateCertificate/UpdateCertificate.test.tsx index 2098ac239ff..d7f468a3417 100644 --- a/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/AuthenticationCard/UpdateCertificate/UpdateCertificate.test.tsx +++ b/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/AuthenticationCard/UpdateCertificate/UpdateCertificate.test.tsx @@ -2,8 +2,8 @@ import configureStore from "redux-mock-store"; import UpdateCertificate from "./UpdateCertificate"; -import { actions as generalActions } from "@/app/store/general"; -import { actions as podActions } from "@/app/store/pod"; +import { generalActions } from "@/app/store/general"; +import { podActions } from "@/app/store/pod"; import type { PodDetails } from "@/app/store/pod/types"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/AuthenticationCard/UpdateCertificate/UpdateCertificate.tsx b/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/AuthenticationCard/UpdateCertificate/UpdateCertificate.tsx index 712b4b88edb..4a40a27941b 100644 --- a/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/AuthenticationCard/UpdateCertificate/UpdateCertificate.tsx +++ b/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/AuthenticationCard/UpdateCertificate/UpdateCertificate.tsx @@ -7,9 +7,9 @@ import UpdateCertificateFields from "./UpdateCertificateFields"; import type { FormikFormProps } from "@/app/base/components/FormikForm"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { generatedCertificate as generatedCertificateSelectors } from "@/app/store/general/selectors"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import podSelectors from "@/app/store/pod/selectors"; import type { PodDetails } from "@/app/store/pod/types"; diff --git a/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/LXDSingleSettings.tsx b/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/LXDSingleSettings.tsx index cc0a0b5ed7c..02c2d716529 100644 --- a/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/LXDSingleSettings.tsx +++ b/src/app/kvm/views/LXDSingleDetails/LXDSingleSettings/LXDSingleSettings.tsx @@ -11,12 +11,12 @@ import type { KVMSetSidePanelContent } from "@/app/kvm/types"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod } from "@/app/store/pod/types"; import { isPodDetails } from "@/app/store/pod/utils"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; type Props = { diff --git a/src/app/kvm/views/VirshDetails/VirshDetailsHeader/VirshDetailsHeader.tsx b/src/app/kvm/views/VirshDetails/VirshDetailsHeader/VirshDetailsHeader.tsx index ee631585cf5..bc140045dce 100644 --- a/src/app/kvm/views/VirshDetails/VirshDetailsHeader/VirshDetailsHeader.tsx +++ b/src/app/kvm/views/VirshDetails/VirshDetailsHeader/VirshDetailsHeader.tsx @@ -11,11 +11,11 @@ import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import KVMDetailsHeader from "@/app/kvm/components/KVMDetailsHeader"; import type { KVMSetSidePanelContent } from "@/app/kvm/types"; -import { actions as podActions } from "@/app/store/pod"; +import { podActions } from "@/app/store/pod"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod } from "@/app/store/pod/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; type Props = { diff --git a/src/app/kvm/views/VirshDetails/VirshSettings/VirshSettings.tsx b/src/app/kvm/views/VirshDetails/VirshSettings/VirshSettings.tsx index 97b5e0eec5f..a135713a58c 100644 --- a/src/app/kvm/views/VirshDetails/VirshSettings/VirshSettings.tsx +++ b/src/app/kvm/views/VirshDetails/VirshSettings/VirshSettings.tsx @@ -6,12 +6,12 @@ import KVMConfigurationCard from "@/app/kvm/components/KVMConfigurationCard"; import podSelectors from "@/app/store/pod/selectors"; import type { Pod } from "@/app/store/pod/types"; import { isPodDetails } from "@/app/store/pod/utils"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; type Props = { diff --git a/src/app/machines/components/MachineForms/AddChassis/AddChassisForm/AddChassisForm.tsx b/src/app/machines/components/MachineForms/AddChassis/AddChassisForm/AddChassisForm.tsx index 4781e0525fe..74ee04b2ca9 100644 --- a/src/app/machines/components/MachineForms/AddChassis/AddChassisForm/AddChassisForm.tsx +++ b/src/app/machines/components/MachineForms/AddChassis/AddChassisForm/AddChassisForm.tsx @@ -11,9 +11,9 @@ import FormikForm from "@/app/base/components/FormikForm"; import docsUrls from "@/app/base/docsUrls"; import { useFetchActions, useAddMessage } from "@/app/base/hooks"; import type { ClearSidePanelContent } from "@/app/base/types"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { powerTypes as powerTypesSelectors } from "@/app/store/general/selectors"; import type { PowerType } from "@/app/store/general/types"; import { PowerFieldScope } from "@/app/store/general/types"; @@ -22,7 +22,7 @@ import { generatePowerParametersSchema, useInitialPowerParameters, } from "@/app/store/general/utils"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; type Props = { diff --git a/src/app/machines/components/MachineForms/AddMachine/AddMachineForm/AddMachineForm.test.tsx b/src/app/machines/components/MachineForms/AddMachine/AddMachineForm/AddMachineForm.test.tsx index bed7677c001..52b07175744 100644 --- a/src/app/machines/components/MachineForms/AddMachine/AddMachineForm/AddMachineForm.test.tsx +++ b/src/app/machines/components/MachineForms/AddMachine/AddMachineForm/AddMachineForm.test.tsx @@ -6,7 +6,7 @@ import configureStore from "redux-mock-store"; import AddMachineForm from "./AddMachineForm"; import { PowerFieldType } from "@/app/store/general/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/machines/components/MachineForms/AddMachine/AddMachineForm/AddMachineForm.tsx b/src/app/machines/components/MachineForms/AddMachine/AddMachineForm/AddMachineForm.tsx index fbd4c4742d7..8ea5b4edb06 100644 --- a/src/app/machines/components/MachineForms/AddMachine/AddMachineForm/AddMachineForm.tsx +++ b/src/app/machines/components/MachineForms/AddMachine/AddMachineForm/AddMachineForm.tsx @@ -13,9 +13,9 @@ import docsUrls from "@/app/base/docsUrls"; import { useFetchActions, useAddMessage } from "@/app/base/hooks"; import type { ClearSidePanelContent } from "@/app/base/types"; import { hostnameValidation, MAC_ADDRESS_REGEX } from "@/app/base/validation"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { PowerTypeNames } from "@/app/store/general/constants"; import { architectures as architecturesSelectors, @@ -29,11 +29,11 @@ import { generatePowerParametersSchema, useInitialPowerParameters, } from "@/app/store/general/utils"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; type Props = { diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneForm.test.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneForm.test.tsx index 79352fc80de..110d62582da 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneForm.test.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneForm.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import CloneForm from "./CloneForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneForm.tsx index e13dd3d44a4..75ac5c01e82 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneForm.tsx @@ -10,7 +10,7 @@ import CloneResults from "./CloneResults"; import ActionForm from "@/app/base/components/ActionForm"; import type { SetSearchFilter } from "@/app/base/types"; import type { MachineActionFormProps } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { Machine, MachineDetails } from "@/app/store/machine/types"; import { useSelectedMachinesActionsDispatch } from "@/app/store/machine/utils/hooks"; import { NodeActions } from "@/app/store/types/node"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/CloneFormFields.test.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/CloneFormFields.test.tsx index 91fa446960f..4bd47215fc8 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/CloneFormFields.test.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/CloneFormFields.test.tsx @@ -4,7 +4,7 @@ import configureStore from "redux-mock-store"; import CloneFormFields from "./CloneFormFields"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/CloneFormFields.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/CloneFormFields.tsx index b9570d59375..40664d2c2da 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/CloneFormFields.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/CloneFormFields.tsx @@ -12,14 +12,14 @@ import SourceMachineSelect from "./SourceMachineSelect"; import FormikField from "@/app/base/components/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import machineSelectors from "@/app/store/machine/selectors"; import type { MachineDetails } from "@/app/store/machine/types"; import { isMachineDetails } from "@/app/store/machine/utils"; import { useFetchMachine } from "@/app/store/machine/utils/hooks"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { subnetActions } from "@/app/store/subnet"; +import { vlanActions } from "@/app/store/vlan"; type Props = { selectedMachine: MachineDetails | null; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/SourceMachineSelect/SourceMachineSelect.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/SourceMachineSelect/SourceMachineSelect.tsx index 8428b9cc7d4..aefcf3857ca 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/SourceMachineSelect/SourceMachineSelect.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CloneForm/CloneFormFields/SourceMachineSelect/SourceMachineSelect.tsx @@ -13,7 +13,7 @@ import MachineListPagination from "@/app/machines/views/MachineList/MachineListT import type { Machine, MachineDetails } from "@/app/store/machine/types"; import { FilterMachines } from "@/app/store/machine/utils"; import { useFetchMachines } from "@/app/store/machine/utils/hooks"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; export enum Label { Loading = "Loading...", diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CommissionForm/CommissionForm.test.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CommissionForm/CommissionForm.test.tsx index 1ba6b783520..fe5a65fb330 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CommissionForm/CommissionForm.test.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CommissionForm/CommissionForm.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import CommissionForm from "./CommissionForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import { ScriptName, ScriptType } from "@/app/store/script/types"; import { PowerState } from "@/app/store/types/enum"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CommissionForm/CommissionForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CommissionForm/CommissionForm.tsx index fb71505e6d0..4373401fea9 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/CommissionForm/CommissionForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/CommissionForm/CommissionForm.tsx @@ -10,7 +10,7 @@ import ActionForm from "@/app/base/components/ActionForm"; import { useFetchActions, useGetURLId } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import type { MachineActionFormProps } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { MachineMeta, type MachineEventErrors, @@ -20,7 +20,7 @@ import { useFetchMachine, useSelectedMachinesActionsDispatch, } from "@/app/store/machine/utils/hooks"; -import { actions as scriptActions } from "@/app/store/script"; +import { scriptActions } from "@/app/store/script"; import scriptSelectors from "@/app/store/script/selectors"; import type { Script } from "@/app/store/script/types"; import { ScriptName } from "@/app/store/script/types"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.test.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.test.tsx index dce62550955..301ba535dc3 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.test.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.test.tsx @@ -4,7 +4,7 @@ import DeployForm from "./DeployForm"; import * as hooks from "@/app/base/hooks/analytics"; import { ConfigNames } from "@/app/store/config/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { renderWithBrowserRouter, screen, userEvent } from "@/testing/utils"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.tsx index 85f23983838..4085c7a5290 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.tsx @@ -7,12 +7,12 @@ import DeployFormFields from "./DeployFormFields"; import ActionForm from "@/app/base/components/ActionForm"; import { useFetchActions, useSendAnalytics } from "@/app/base/hooks"; import type { MachineActionFormProps } from "@/app/machines/types"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { defaultMinHweKernel as defaultMinHweKernelSelectors, osInfo as osInfoSelectors, } from "@/app/store/general/selectors"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineEventErrors } from "@/app/store/machine/types"; import { useSelectedMachinesActionsDispatch } from "@/app/store/machine/utils/hooks"; import { PodType } from "@/app/store/pod/constants"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/MachineActionFormWrapper.test.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/MachineActionFormWrapper.test.tsx index bd905e3871e..5a58ddffbce 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/MachineActionFormWrapper.test.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/MachineActionFormWrapper.test.tsx @@ -4,7 +4,7 @@ import type { Mock } from "vitest"; import MachineActionFormWrapper from "./MachineActionFormWrapper"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; import { NodeActions } from "@/app/store/types/node"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/MachineActionFormWrapper.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/MachineActionFormWrapper.tsx index 6fec91e032c..1286021af9b 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/MachineActionFormWrapper.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/MachineActionFormWrapper.tsx @@ -22,7 +22,7 @@ import { useScrollOnRender } from "@/app/base/hooks"; import type { ClearSidePanelContent, SetSearchFilter } from "@/app/base/types"; import urls from "@/app/base/urls"; import type { MachineActionFormProps } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineActions, MachineEventErrors, diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/MarkBrokenForm/MarkBrokenForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/MarkBrokenForm/MarkBrokenForm.tsx index 79381fadc98..ec42b636be2 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/MarkBrokenForm/MarkBrokenForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/MarkBrokenForm/MarkBrokenForm.tsx @@ -7,7 +7,7 @@ import MarkBrokenFormFields from "./MarkBrokenFormFields"; import ActionForm from "@/app/base/components/ActionForm"; import type { MachineActionFormProps } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineEventErrors } from "@/app/store/machine/types"; import { useSelectedMachinesActionsDispatch } from "@/app/store/machine/utils/hooks"; import { NodeActions } from "@/app/store/types/node"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/OverrideTestForm/OverrideTestForm.test.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/OverrideTestForm/OverrideTestForm.test.tsx index df88e1ef7ea..112b64969e8 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/OverrideTestForm/OverrideTestForm.test.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/OverrideTestForm/OverrideTestForm.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import OverrideTestForm from "./OverrideTestForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { FetchFilters } from "@/app/store/machine/types"; import { FetchGroupKey } from "@/app/store/machine/types"; import { selectedToFilters } from "@/app/store/machine/utils"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/OverrideTestForm/OverrideTestForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/OverrideTestForm/OverrideTestForm.tsx index 2dbd1b4adc4..54a8f11cf1a 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/OverrideTestForm/OverrideTestForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/OverrideTestForm/OverrideTestForm.tsx @@ -8,7 +8,7 @@ import FormikField from "@/app/base/components/FormikField"; import { useSendAnalytics } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import type { MachineActionFormProps } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineEventErrors } from "@/app/store/machine/types"; import { useSelectedMachinesActionsDispatch } from "@/app/store/machine/utils/hooks"; import { NodeActions } from "@/app/store/types/node"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/ReleaseForm/ReleaseForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/ReleaseForm/ReleaseForm.tsx index 819831abdcf..e386f688231 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/ReleaseForm/ReleaseForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/ReleaseForm/ReleaseForm.tsx @@ -8,9 +8,9 @@ import ReleaseFormFields from "./ReleaseFormFields"; import ActionForm from "@/app/base/components/ActionForm"; import type { MachineActionFormProps } from "@/app/machines/types"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineEventErrors } from "@/app/store/machine/types"; import { useSelectedMachinesActionsDispatch } from "@/app/store/machine/utils/hooks"; import { NodeActions } from "@/app/store/types/node"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/SetPoolForm/SetPoolForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/SetPoolForm/SetPoolForm.tsx index 4ab4beaa93d..fb003df7526 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/SetPoolForm/SetPoolForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/SetPoolForm/SetPoolForm.tsx @@ -9,10 +9,10 @@ import type { SetPoolFormValues } from "./types"; import ActionForm from "@/app/base/components/ActionForm"; import { useFetchActions } from "@/app/base/hooks"; import type { MachineActionFormProps } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineEventErrors } from "@/app/store/machine/types"; import { useSelectedMachinesActionsDispatch } from "@/app/store/machine/utils/hooks"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; import { NodeActions } from "@/app/store/types/node"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/AddTagForm/AddTagForm.test.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/AddTagForm/AddTagForm.test.tsx index 67184b710db..2b2bc82c945 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/AddTagForm/AddTagForm.test.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/AddTagForm/AddTagForm.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import AddTagForm from "./AddTagForm"; import type { Props } from "./AddTagForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { FetchFilters } from "@/app/store/machine/types"; import { FetchGroupKey } from "@/app/store/machine/types"; import * as query from "@/app/store/machine/utils/query"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.test.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.test.tsx index d90abb8c17b..ce225b46c69 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.test.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.test.tsx @@ -8,7 +8,7 @@ import TagForm, { Label } from "./TagForm"; import { Label as TagFormChangesLabel } from "./TagFormChanges"; import { Label as TagFormFieldsLabel } from "./TagFormFields"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; import { Label as AddTagFormLabel } from "@/app/tags/components/AddTagForm/AddTagForm"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.tsx index 992fdcb8a65..a9d221ddd08 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.tsx @@ -11,11 +11,11 @@ import type { TagFormValues } from "./types"; import ActionForm from "@/app/base/components/ActionForm"; import { useSidePanel } from "@/app/base/side-panel-context"; import type { MachineActionFormProps } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { MachineEventErrors } from "@/app/store/machine/types"; import { selectedToFilters } from "@/app/store/machine/utils"; import { useSelectedMachinesActionsDispatch } from "@/app/store/machine/utils/hooks"; -import { actions as messageActions } from "@/app/store/message"; +import { messageActions } from "@/app/store/message"; import tagSelectors from "@/app/store/tag/selectors"; import type { Tag, TagMeta } from "@/app/store/tag/types"; import { NodeActions } from "@/app/store/types/node"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/hooks.test.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/hooks.test.tsx index 6dcec56c399..3b34daa3286 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/hooks.test.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/hooks.test.tsx @@ -9,7 +9,7 @@ import configureStore from "redux-mock-store"; import { useFetchTags, useSelectedTags, useUnchangedTags } from "./hooks"; import * as query from "@/app/store/machine/utils/query"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import * as factory from "@/testing/factories"; import { waitFor } from "@/testing/utils"; diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/hooks.ts b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/hooks.ts index b282ff6de77..ae6ae7379ff 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/hooks.ts +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/hooks.ts @@ -14,7 +14,7 @@ import type { SelectedMachines } from "@/app/store/machine/types/base"; import { FilterMachines, selectedToFilters } from "@/app/store/machine/utils"; import type { UseFetchQueryOptions } from "@/app/store/machine/utils/hooks"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import type { Tag, TagMeta } from "@/app/store/tag/types"; import type { TagStateList } from "@/app/store/tag/types/base"; diff --git a/src/app/machines/components/TableCheckbox/TableCheckbox.test.tsx b/src/app/machines/components/TableCheckbox/TableCheckbox.test.tsx index 5b8aadd3405..e89a65d995e 100644 --- a/src/app/machines/components/TableCheckbox/TableCheckbox.test.tsx +++ b/src/app/machines/components/TableCheckbox/TableCheckbox.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import TableCheckbox, { Checked } from "./TableCheckbox"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { diff --git a/src/app/machines/components/TableCheckbox/TableCheckbox.tsx b/src/app/machines/components/TableCheckbox/TableCheckbox.tsx index c8cd6ae5a53..b99d59b30e7 100644 --- a/src/app/machines/components/TableCheckbox/TableCheckbox.tsx +++ b/src/app/machines/components/TableCheckbox/TableCheckbox.tsx @@ -5,7 +5,7 @@ import { Input } from "@canonical/react-components"; import classNames from "classnames"; import { useSelector, useDispatch } from "react-redux"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { SelectedMachines } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/machines/views/MachineDetails/MachineCommissioning/MachineCommissioning.tsx b/src/app/machines/views/MachineDetails/MachineCommissioning/MachineCommissioning.tsx index 91ba2c01619..1d17c9b72e0 100644 --- a/src/app/machines/views/MachineDetails/MachineCommissioning/MachineCommissioning.tsx +++ b/src/app/machines/views/MachineDetails/MachineCommissioning/MachineCommissioning.tsx @@ -11,7 +11,7 @@ import machineSelectors from "@/app/store/machine/selectors"; import { MachineMeta } from "@/app/store/machine/types"; import { isMachineDetails } from "@/app/store/machine/utils"; import type { RootState } from "@/app/store/root/types"; -import { actions as scriptResultActions } from "@/app/store/scriptresult"; +import { scriptResultActions } from "@/app/store/scriptresult"; import scriptResultSelectors from "@/app/store/scriptresult/selectors"; import { TestStatusStatus } from "@/app/store/types/node"; import { isId } from "@/app/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineConfiguration/MachineForm/MachineForm.test.tsx b/src/app/machines/views/MachineDetails/MachineConfiguration/MachineForm/MachineForm.test.tsx index 68e8d00f823..1729ae74cad 100644 --- a/src/app/machines/views/MachineDetails/MachineConfiguration/MachineForm/MachineForm.test.tsx +++ b/src/app/machines/views/MachineDetails/MachineConfiguration/MachineForm/MachineForm.test.tsx @@ -6,7 +6,7 @@ import configureStore from "redux-mock-store"; import MachineForm from "./MachineForm"; import { Labels } from "@/app/base/components/EditableSection"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineConfiguration/MachineForm/MachineForm.tsx b/src/app/machines/views/MachineDetails/MachineConfiguration/MachineForm/MachineForm.tsx index 47340c58d3c..24a69c6fd98 100644 --- a/src/app/machines/views/MachineDetails/MachineConfiguration/MachineForm/MachineForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineConfiguration/MachineForm/MachineForm.tsx @@ -11,7 +11,7 @@ import Definition from "@/app/base/components/Definition"; import EditableSection from "@/app/base/components/EditableSection"; import FormikForm from "@/app/base/components/FormikForm"; import { useCanEdit } from "@/app/base/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { MachineDetails } from "@/app/store/machine/types"; import { isMachineDetails } from "@/app/store/machine/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineConfiguration/PowerForm/PowerForm.test.tsx b/src/app/machines/views/MachineDetails/MachineConfiguration/PowerForm/PowerForm.test.tsx index c1404e2de63..af1e410ea35 100644 --- a/src/app/machines/views/MachineDetails/MachineConfiguration/PowerForm/PowerForm.test.tsx +++ b/src/app/machines/views/MachineDetails/MachineConfiguration/PowerForm/PowerForm.test.tsx @@ -8,7 +8,7 @@ import PowerForm from "./PowerForm"; import { Labels } from "@/app/base/components/EditableSection"; import { PowerTypeNames } from "@/app/store/general/constants"; import { PowerFieldScope, PowerFieldType } from "@/app/store/general/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineConfiguration/PowerForm/PowerForm.tsx b/src/app/machines/views/MachineDetails/MachineConfiguration/PowerForm/PowerForm.tsx index aed43abf088..6b364544a3f 100644 --- a/src/app/machines/views/MachineDetails/MachineConfiguration/PowerForm/PowerForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineConfiguration/PowerForm/PowerForm.tsx @@ -19,7 +19,7 @@ import { getPowerTypeFromName, useInitialPowerParameters, } from "@/app/store/general/utils"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; import { diff --git a/src/app/machines/views/MachineDetails/MachineConfiguration/TagForm/TagForm.tsx b/src/app/machines/views/MachineDetails/MachineConfiguration/TagForm/TagForm.tsx index 651488ab356..1b8a20fd50a 100644 --- a/src/app/machines/views/MachineDetails/MachineConfiguration/TagForm/TagForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineConfiguration/TagForm/TagForm.tsx @@ -10,7 +10,7 @@ import machineSelectors from "@/app/store/machine/selectors"; import type { MachineDetails } from "@/app/store/machine/types"; import { FilterMachines } from "@/app/store/machine/utils"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import { NodeActions } from "@/app/store/types/node"; diff --git a/src/app/machines/views/MachineDetails/MachineDetails.tsx b/src/app/machines/views/MachineDetails/MachineDetails.tsx index fcfb6ecad72..45a6acde592 100644 --- a/src/app/machines/views/MachineDetails/MachineDetails.tsx +++ b/src/app/machines/views/MachineDetails/MachineDetails.tsx @@ -26,10 +26,10 @@ import { useGetURLId } from "@/app/base/hooks/urls"; import { useSidePanel } from "@/app/base/side-panel-context"; import urls from "@/app/base/urls"; import MachineForms from "@/app/machines/components/MachineForms"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { MachineMeta } from "@/app/store/machine/types"; import { useFetchMachine } from "@/app/store/machine/utils/hooks"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import { getSidePanelTitle } from "@/app/store/utils/node/base"; import { getRelativeRoute, isId } from "@/app/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineHeader/MachineHeader.test.tsx b/src/app/machines/views/MachineDetails/MachineHeader/MachineHeader.test.tsx index 6e54f44992a..c7bfd8b1f03 100644 --- a/src/app/machines/views/MachineDetails/MachineHeader/MachineHeader.test.tsx +++ b/src/app/machines/views/MachineDetails/MachineHeader/MachineHeader.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import MachineHeader from "./MachineHeader"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import { PowerState } from "@/app/store/types/enum"; import { diff --git a/src/app/machines/views/MachineDetails/MachineHeader/MachineHeader.tsx b/src/app/machines/views/MachineDetails/MachineHeader/MachineHeader.tsx index 93e83b860be..2fc786a999f 100644 --- a/src/app/machines/views/MachineDetails/MachineHeader/MachineHeader.tsx +++ b/src/app/machines/views/MachineDetails/MachineHeader/MachineHeader.tsx @@ -15,7 +15,7 @@ import TooltipButton from "@/app/base/components/TooltipButton"; import { useSendAnalytics } from "@/app/base/hooks"; import { MachineSidePanelViews } from "@/app/machines/constants"; import type { MachineSetSidePanelContent } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; import { isMachineDetails } from "@/app/store/machine/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineHeader/MachineName/MachineName.tsx b/src/app/machines/views/MachineDetails/MachineHeader/MachineName/MachineName.tsx index b81ba7738bc..72d1e41a85c 100644 --- a/src/app/machines/views/MachineDetails/MachineHeader/MachineName/MachineName.tsx +++ b/src/app/machines/views/MachineDetails/MachineHeader/MachineName/MachineName.tsx @@ -2,9 +2,9 @@ import { useDispatch, useSelector } from "react-redux"; import NodeName from "@/app/base/components/NodeName"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/AddAliasOrVlan/AddAliasOrVlan.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/AddAliasOrVlan/AddAliasOrVlan.tsx index db6074ade7a..f0e1bdc7b18 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/AddAliasOrVlan/AddAliasOrVlan.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/AddAliasOrVlan/AddAliasOrVlan.tsx @@ -15,7 +15,7 @@ import type { AddAliasOrVlanValues } from "./types"; import FormikForm from "@/app/base/components/FormikForm"; import { useScrollOnRender } from "@/app/base/hooks"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { CreateVlanParams, diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/AddBondForm/AddBondForm.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/AddBondForm/AddBondForm.tsx index 88703e31483..1c7831a43f5 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/AddBondForm/AddBondForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/AddBondForm/AddBondForm.tsx @@ -27,14 +27,14 @@ import type { import { useFetchActions, useIsAllNetworkingDisabled } from "@/app/base/hooks"; import { MAC_ADDRESS_REGEX } from "@/app/base/validation"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import { BondLacpRate, BondMode, BondXmitHashPolicy, } from "@/app/store/general/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { CreateBondParams, @@ -43,7 +43,7 @@ import type { 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 { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import { NetworkInterfaceTypes } from "@/app/store/types/enum"; import type { NetworkInterface } from "@/app/store/types/node"; @@ -52,7 +52,7 @@ import { getLinkFromNic, getNextNicName, } from "@/app/store/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; type Props = { diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/AddBridgeForm/AddBridgeForm.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/AddBridgeForm/AddBridgeForm.tsx index ab8629d3b91..79c5ecc107c 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/AddBridgeForm/AddBridgeForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/AddBridgeForm/AddBridgeForm.tsx @@ -21,7 +21,7 @@ import type { import { useFetchActions } from "@/app/base/hooks"; import { MAC_ADDRESS_REGEX } from "@/app/base/validation"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { CreateBridgeParams, @@ -32,7 +32,7 @@ import { isMachineDetails } from "@/app/store/machine/utils"; import type { RootState } from "@/app/store/root/types"; import { BridgeType, NetworkInterfaceTypes } from "@/app/store/types/enum"; import { getNextNicName } from "@/app/store/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import { preparePayload } from "@/app/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/AddInterface/AddInterface.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/AddInterface/AddInterface.tsx index 861ef795e00..e1852136099 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/AddInterface/AddInterface.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/AddInterface/AddInterface.tsx @@ -18,7 +18,7 @@ import TagNameField from "@/app/base/components/TagNameField"; import { useScrollOnRender } from "@/app/base/hooks"; import { MAC_ADDRESS_REGEX } from "@/app/base/validation"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { CreatePhysicalParams, diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/BondModeSelect/BondModeSelect.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/BondModeSelect/BondModeSelect.tsx index e45ddedd6be..13e02ee6ad3 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/BondModeSelect/BondModeSelect.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/BondModeSelect/BondModeSelect.tsx @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import DynamicSelect from "@/app/base/components/DynamicSelect"; import type { Props as FormikFieldProps } from "@/app/base/components/FormikField/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { bondOptions as bondOptionsSelectors } from "@/app/store/general/selectors"; type Props = { diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/HashPolicySelect/HashPolicySelect.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/HashPolicySelect/HashPolicySelect.tsx index 6d05122f9d0..edd99737865 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/HashPolicySelect/HashPolicySelect.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/HashPolicySelect/HashPolicySelect.tsx @@ -7,7 +7,7 @@ import type { BondFormValues } from "../types"; import DynamicSelect from "@/app/base/components/DynamicSelect"; import type { Props as FormikFieldProps } from "@/app/base/components/FormikField/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { bondOptions as bondOptionsSelectors } from "@/app/store/general/selectors"; import { BondMode, BondXmitHashPolicy } from "@/app/store/general/types"; diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/LACPRateSelect/LACPRateSelect.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/LACPRateSelect/LACPRateSelect.tsx index 484e0a327d1..893b2efef2e 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/LACPRateSelect/LACPRateSelect.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/BondForm/LACPRateSelect/LACPRateSelect.tsx @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import DynamicSelect from "@/app/base/components/DynamicSelect"; import type { Props as FormikFieldProps } from "@/app/base/components/FormikField/FormikField"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { bondOptions as bondOptionsSelectors } from "@/app/store/general/selectors"; type Props = { diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/EditAliasOrVlanForm/EditAliasOrVlanForm.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/EditAliasOrVlanForm/EditAliasOrVlanForm.tsx index 74504cee889..a3bc8e7396c 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/EditAliasOrVlanForm/EditAliasOrVlanForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/EditAliasOrVlanForm/EditAliasOrVlanForm.tsx @@ -13,15 +13,15 @@ import FormikForm from "@/app/base/components/FormikForm"; import TagNameField from "@/app/base/components/TagNameField"; import { useFetchActions, useIsAllNetworkingDisabled } from "@/app/base/hooks"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { MachineDetails } 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 { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import { NetworkInterfaceTypes } from "@/app/store/types/enum"; import type { @@ -35,7 +35,7 @@ import { getInterfaceSubnet, getLinkMode, } from "@/app/store/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import { preparePayload } from "@/app/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/EditBondForm/EditBondForm.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/EditBondForm/EditBondForm.tsx index 5b2174b896d..25b524f0a20 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/EditBondForm/EditBondForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/EditBondForm/EditBondForm.tsx @@ -24,20 +24,20 @@ import type { import { useFetchActions, useIsAllNetworkingDisabled } from "@/app/base/hooks"; import { MAC_ADDRESS_REGEX } from "@/app/base/validation"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import { BondLacpRate, BondMode, BondXmitHashPolicy, } from "@/app/store/general/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { MachineDetails } 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 { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { NetworkInterface, @@ -49,7 +49,7 @@ import { getInterfaceSubnet, getLinkMode, } from "@/app/store/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import { arrayItemsEqual } from "@/app/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/EditBridgeForm/EditBridgeForm.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/EditBridgeForm/EditBridgeForm.tsx index 1a0e86cc187..d618f93f745 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/EditBridgeForm/EditBridgeForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/EditBridgeForm/EditBridgeForm.tsx @@ -12,7 +12,7 @@ import FormikForm from "@/app/base/components/FormikForm"; import { useFetchActions } from "@/app/base/hooks"; import { MAC_ADDRESS_REGEX } from "@/app/base/validation"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { MachineDetails } from "@/app/store/machine/types"; import type { MachineEventErrors } from "@/app/store/machine/types/base"; @@ -24,7 +24,7 @@ import type { UpdateInterfaceParams, } from "@/app/store/types/node"; import { getInterfaceTypeText } from "@/app/store/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import { preparePayload } from "@/app/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/EditPhysicalForm/EditPhysicalForm.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/EditPhysicalForm/EditPhysicalForm.tsx index 3d0a929d744..9ae329174af 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/EditPhysicalForm/EditPhysicalForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/EditPhysicalForm/EditPhysicalForm.tsx @@ -13,15 +13,15 @@ import FormikForm from "@/app/base/components/FormikForm"; import { useFetchActions, useIsAllNetworkingDisabled } from "@/app/base/hooks"; import { MAC_ADDRESS_REGEX } from "@/app/base/validation"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine, MachineDetails } 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 { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { NetworkInterface, @@ -34,7 +34,7 @@ import { getLinkFromNic, getLinkMode, } from "@/app/store/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import { preparePayload } from "@/app/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/MarkConnectedForm/MarkConnectedForm.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/MarkConnectedForm/MarkConnectedForm.tsx index f03290c7786..aef9ad340a1 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/MarkConnectedForm/MarkConnectedForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/MarkConnectedForm/MarkConnectedForm.tsx @@ -3,7 +3,7 @@ import { useState, type ReactNode } from "react"; import { useDispatch, useSelector } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { MachineDetails } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/NetworkTable/NetworkTableConfirmation/NetworkTableConfirmation.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/NetworkTable/NetworkTableConfirmation/NetworkTableConfirmation.tsx index 3f9b5423d27..efba6475fb8 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/NetworkTable/NetworkTableConfirmation/NetworkTableConfirmation.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/NetworkTable/NetworkTableConfirmation/NetworkTableConfirmation.tsx @@ -10,7 +10,7 @@ import type { } from "@/app/base/components/NodeNetworkTab/NodeNetworkTab"; import { ExpandedState } from "@/app/base/components/NodeNetworkTab/NodeNetworkTab"; import ActionConfirm from "@/app/base/components/node/ActionConfirm"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/machines/views/MachineDetails/MachineNetwork/RemovePhysicalForm/RemovePhysicalForm.tsx b/src/app/machines/views/MachineDetails/MachineNetwork/RemovePhysicalForm/RemovePhysicalForm.tsx index 5ae9a1cd84b..8cc1897fe41 100644 --- a/src/app/machines/views/MachineDetails/MachineNetwork/RemovePhysicalForm/RemovePhysicalForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineNetwork/RemovePhysicalForm/RemovePhysicalForm.tsx @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/machines/views/MachineDetails/MachinePCIDevices/MachinePCIDevices.test.tsx b/src/app/machines/views/MachineDetails/MachinePCIDevices/MachinePCIDevices.test.tsx index c4e0b2ea459..3d50a4bf3aa 100644 --- a/src/app/machines/views/MachineDetails/MachinePCIDevices/MachinePCIDevices.test.tsx +++ b/src/app/machines/views/MachineDetails/MachinePCIDevices/MachinePCIDevices.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import MachinePCIDevices from "./MachinePCIDevices"; -import { actions as nodeDeviceActions } from "@/app/store/nodedevice"; +import { nodeDeviceActions } from "@/app/store/nodedevice"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { renderWithBrowserRouter, waitFor } from "@/testing/utils"; diff --git a/src/app/machines/views/MachineDetails/MachineStorage/ChangeStorageLayout/ChangeStorageLayout.tsx b/src/app/machines/views/MachineDetails/MachineStorage/ChangeStorageLayout/ChangeStorageLayout.tsx index 0ae796989a6..5732a6df319 100644 --- a/src/app/machines/views/MachineDetails/MachineStorage/ChangeStorageLayout/ChangeStorageLayout.tsx +++ b/src/app/machines/views/MachineDetails/MachineStorage/ChangeStorageLayout/ChangeStorageLayout.tsx @@ -4,7 +4,7 @@ import { useDispatch } from "react-redux"; import FormikForm from "@/app/base/components/FormikForm"; import type { ClearSidePanelContent, EmptyObject } from "@/app/base/types"; import { useMachineDetailsForm } from "@/app/machines/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { Machine, StorageLayoutOption } from "@/app/store/machine/types"; import type { MachineEventErrors } from "@/app/store/machine/types/base"; import { StorageLayout } from "@/app/store/types/enum"; diff --git a/src/app/machines/views/MachineDetails/MachineSummary/SummaryNotifications/SummaryNotifications.tsx b/src/app/machines/views/MachineDetails/MachineSummary/SummaryNotifications/SummaryNotifications.tsx index eedc8cff106..1369a3d6472 100644 --- a/src/app/machines/views/MachineDetails/MachineSummary/SummaryNotifications/SummaryNotifications.tsx +++ b/src/app/machines/views/MachineDetails/MachineSummary/SummaryNotifications/SummaryNotifications.tsx @@ -8,7 +8,7 @@ import { } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import MachineNotifications from "@/app/machines/views/MachineDetails/MachineNotifications"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { architectures as architecturesSelectors } from "@/app/store/general/selectors"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; diff --git a/src/app/machines/views/MachineDetails/MachineTests/MachineTests.tsx b/src/app/machines/views/MachineDetails/MachineTests/MachineTests.tsx index f008def8c9c..806fa6eb41e 100644 --- a/src/app/machines/views/MachineDetails/MachineTests/MachineTests.tsx +++ b/src/app/machines/views/MachineDetails/MachineTests/MachineTests.tsx @@ -12,7 +12,7 @@ import machineSelectors from "@/app/store/machine/selectors"; import { MachineMeta } from "@/app/store/machine/types"; import { isMachineDetails } from "@/app/store/machine/utils"; import type { RootState } from "@/app/store/root/types"; -import { actions as scriptResultActions } from "@/app/store/scriptresult"; +import { scriptResultActions } from "@/app/store/scriptresult"; import scriptResultSelectors from "@/app/store/scriptresult/selectors"; import type { ScriptResult } from "@/app/store/scriptresult/types"; import { TestStatusStatus } from "@/app/store/types/node"; diff --git a/src/app/machines/views/MachineDetails/MachineUSBDevices/MachineUSBDevices.test.tsx b/src/app/machines/views/MachineDetails/MachineUSBDevices/MachineUSBDevices.test.tsx index 1e1f79ab82b..2fa793d2040 100644 --- a/src/app/machines/views/MachineDetails/MachineUSBDevices/MachineUSBDevices.test.tsx +++ b/src/app/machines/views/MachineDetails/MachineUSBDevices/MachineUSBDevices.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import MachineUSBDevices from "./MachineUSBDevices"; -import { actions as nodeDeviceActions } from "@/app/store/nodedevice"; +import { nodeDeviceActions } from "@/app/store/nodedevice"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { renderWithBrowserRouter } from "@/testing/utils"; diff --git a/src/app/machines/views/MachineList/MachineList.test.tsx b/src/app/machines/views/MachineList/MachineList.test.tsx index 561912dc92f..9e130fffe9a 100644 --- a/src/app/machines/views/MachineList/MachineList.test.tsx +++ b/src/app/machines/views/MachineList/MachineList.test.tsx @@ -4,7 +4,7 @@ import configureStore from "redux-mock-store"; import MachineList from "./MachineList"; import { DEFAULTS } from "./MachineListTable/constants"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; import { diff --git a/src/app/machines/views/MachineList/MachineList.tsx b/src/app/machines/views/MachineList/MachineList.tsx index 39b589b2217..a4a59a6d3c0 100644 --- a/src/app/machines/views/MachineList/MachineList.tsx +++ b/src/app/machines/views/MachineList/MachineList.tsx @@ -11,9 +11,9 @@ import { usePageSize, type useResponsiveColumns } from "./hooks"; import VaultNotification from "@/app/base/components/VaultNotification"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; import type { SortDirection } from "@/app/base/types"; -import { actions as controllerActions } from "@/app/store/controller"; -import { actions as generalActions } from "@/app/store/general"; -import { actions as machineActions } from "@/app/store/machine"; +import { controllerActions } from "@/app/store/controller"; +import { generalActions } from "@/app/store/general"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { FetchGroupKey } from "@/app/store/machine/types"; import { FilterMachines } from "@/app/store/machine/utils"; diff --git a/src/app/machines/views/MachineList/MachineListControls/MachineListControls.test.tsx b/src/app/machines/views/MachineList/MachineListControls/MachineListControls.test.tsx index 7114c5cacad..626df95e008 100644 --- a/src/app/machines/views/MachineList/MachineListControls/MachineListControls.test.tsx +++ b/src/app/machines/views/MachineList/MachineListControls/MachineListControls.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import MachineListControls from "./MachineListControls"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { diff --git a/src/app/machines/views/MachineList/MachineListControls/MachineListControls.tsx b/src/app/machines/views/MachineList/MachineListControls/MachineListControls.tsx index 35dd4960979..ea2bfd00cc2 100644 --- a/src/app/machines/views/MachineList/MachineListControls/MachineListControls.tsx +++ b/src/app/machines/views/MachineList/MachineListControls/MachineListControls.tsx @@ -16,7 +16,7 @@ import MachineActionMenu from "@/app/machines/views/MachineList/MachineListContr import MachinesFilterAccordion from "@/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion"; import AddHardwareMenu from "@/app/machines/views/MachineList/MachineListHeader/AddHardwareMenu"; import type { useResponsiveColumns } from "@/app/machines/views/MachineList/hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { FetchGroupKey } from "@/app/store/machine/types"; import { useHasSelection } from "@/app/store/machine/utils/hooks"; diff --git a/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterAccordion.test.tsx b/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterAccordion.test.tsx index 46777419be4..e1fb660317b 100644 --- a/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterAccordion.test.tsx +++ b/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterAccordion.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import MachinesFilterAccordion, { Label } from "./MachinesFilterAccordion"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { FilterGroupKey } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterAccordion.tsx b/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterAccordion.tsx index c6b0ade094c..34cbf33f3df 100644 --- a/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterAccordion.tsx +++ b/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterAccordion.tsx @@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "react-redux"; import MachinesFilterOptions from "./MachinesFilterOptions"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import { FilterGroupKey } from "@/app/store/machine/types"; diff --git a/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterOptions/MachinesFilterOptions.test.tsx b/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterOptions/MachinesFilterOptions.test.tsx index 45cf741f48b..7a26860e9e7 100644 --- a/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterOptions/MachinesFilterOptions.test.tsx +++ b/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterOptions/MachinesFilterOptions.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import MachinesFilterOptions, { Label } from "./MachinesFilterOptions"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { FilterGroup } from "@/app/store/machine/types"; import { FilterGroupKey } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterOptions/MachinesFilterOptions.tsx b/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterOptions/MachinesFilterOptions.tsx index 4a34db73dfd..5ab12c8709c 100644 --- a/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterOptions/MachinesFilterOptions.tsx +++ b/src/app/machines/views/MachineList/MachineListControls/MachinesFilterAccordion/MachinesFilterOptions/MachinesFilterOptions.tsx @@ -5,7 +5,7 @@ import { Button, List, Spinner } from "@canonical/react-components"; import classNames from "classnames"; import { useDispatch, useSelector } from "react-redux"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { FilterGroup, diff --git a/src/app/machines/views/MachineList/MachineListHeader/MachineListHeader.tsx b/src/app/machines/views/MachineList/MachineListHeader/MachineListHeader.tsx index 82c48e4b67d..6c0456671d6 100644 --- a/src/app/machines/views/MachineList/MachineListHeader/MachineListHeader.tsx +++ b/src/app/machines/views/MachineList/MachineListHeader/MachineListHeader.tsx @@ -8,10 +8,10 @@ import type { useResponsiveColumns } from "../hooks"; import { useFetchActions } from "@/app/base/hooks"; import type { SetSearchFilter } from "@/app/base/types"; import type { MachineSetSidePanelContent } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { FetchGroupKey } from "@/app/store/machine/types"; import { useFetchMachineCount } from "@/app/store/machine/utils/hooks"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; type Props = { diff --git a/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllCheckbox.test.tsx b/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllCheckbox.test.tsx index 9a9f71afeba..61732599412 100644 --- a/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllCheckbox.test.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllCheckbox.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import AllCheckbox, { Label } from "./AllCheckbox"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { userEvent, screen, renderWithMockStore } from "@/testing/utils"; diff --git a/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllDropdown/AllDropdown.test.tsx b/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllDropdown/AllDropdown.test.tsx index b717f03e392..7342131584d 100644 --- a/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllDropdown/AllDropdown.test.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllDropdown/AllDropdown.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import AllDropdown, { AllDropdownLabel } from "./AllDropdown"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import { FetchNodeStatus } from "@/app/store/types/node"; import * as factory from "@/testing/factories"; diff --git a/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllDropdown/AllDropdown.tsx b/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllDropdown/AllDropdown.tsx index 1da246e3814..9c7906d760a 100644 --- a/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllDropdown/AllDropdown.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/AllDropdown/AllDropdown.tsx @@ -3,7 +3,7 @@ import { useDispatch, useSelector } from "react-redux"; import { generateSelectedAll, generateSelectedOnCurrentPage } from "../utils"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { FetchFilters } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/machines/views/MachineList/MachineListTable/GroupCheckbox/GroupCheckbox.test.tsx b/src/app/machines/views/MachineList/MachineListTable/GroupCheckbox/GroupCheckbox.test.tsx index ce538dc0c51..f6489e4469b 100644 --- a/src/app/machines/views/MachineList/MachineListTable/GroupCheckbox/GroupCheckbox.test.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/GroupCheckbox/GroupCheckbox.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import GroupCheckbox from "./GroupCheckbox"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { FetchGroupKey } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; diff --git a/src/app/machines/views/MachineList/MachineListTable/MachineCheckbox/MachineCheckbox.test.tsx b/src/app/machines/views/MachineList/MachineListTable/MachineCheckbox/MachineCheckbox.test.tsx index 0a4430e4bb3..2e1f61742d7 100644 --- a/src/app/machines/views/MachineList/MachineListTable/MachineCheckbox/MachineCheckbox.test.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/MachineCheckbox/MachineCheckbox.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import MachineCheckbox, { getSelectedMachinesRange } from "./MachineCheckbox"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { userEvent, screen, renderWithMockStore } from "@/testing/utils"; diff --git a/src/app/machines/views/MachineList/MachineListTable/MachineListSelectedCount/MachineListSelectedCount.test.tsx b/src/app/machines/views/MachineList/MachineListTable/MachineListSelectedCount/MachineListSelectedCount.test.tsx index d19228212d7..6a528a18f40 100644 --- a/src/app/machines/views/MachineList/MachineListTable/MachineListSelectedCount/MachineListSelectedCount.test.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/MachineListSelectedCount/MachineListSelectedCount.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import MachineListSelectedCount from "./MachineListSelectedCount"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { RootState } from "@/app/store/root/types"; import { screen, diff --git a/src/app/machines/views/MachineList/MachineListTable/MachineListSelectedCount/MachineListSelectedCount.tsx b/src/app/machines/views/MachineList/MachineListTable/MachineListSelectedCount/MachineListSelectedCount.tsx index 7ac160e7ae5..f2ce073b90b 100644 --- a/src/app/machines/views/MachineList/MachineListTable/MachineListSelectedCount/MachineListSelectedCount.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/MachineListSelectedCount/MachineListSelectedCount.tsx @@ -2,7 +2,7 @@ import { Notification, Button } from "@canonical/react-components"; import pluralize from "pluralize"; import { useDispatch } from "react-redux"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { FilterMachines } from "@/app/store/machine/utils"; type Props = { diff --git a/src/app/machines/views/MachineList/MachineListTable/MachineListTable.tsx b/src/app/machines/views/MachineList/MachineListTable/MachineListTable.tsx index e7ad803b313..b980426d861 100644 --- a/src/app/machines/views/MachineList/MachineListTable/MachineListTable.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/MachineListTable.tsx @@ -24,14 +24,14 @@ import { MachineColumns, groupOptions, } from "@/app/machines/constants"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { FetchGroupKey } from "@/app/store/machine/types"; import { FilterMachines } from "@/app/store/machine/utils"; import { useMachineSelectedCount } from "@/app/store/machine/utils/hooks"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; -import { actions as tagActions } from "@/app/store/tag"; -import { actions as userActions } from "@/app/store/user"; -import { actions as zoneActions } from "@/app/store/zone"; +import { resourcePoolActions } from "@/app/store/resourcepool"; +import { tagActions } from "@/app/store/tag"; +import { userActions } from "@/app/store/user"; +import { zoneActions } from "@/app/store/zone"; import { generateEmptyStateMsg, getTableStatus } from "@/app/utils"; export enum Label { diff --git a/src/app/machines/views/MachineList/MachineListTable/PoolColumn/PoolColumn.tsx b/src/app/machines/views/MachineList/MachineListTable/PoolColumn/PoolColumn.tsx index dce201bc4e2..04c8a16bd48 100644 --- a/src/app/machines/views/MachineList/MachineListTable/PoolColumn/PoolColumn.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/PoolColumn/PoolColumn.tsx @@ -8,7 +8,7 @@ import DoubleRow from "@/app/base/components/DoubleRow"; import urls from "@/app/base/urls"; import { useToggleMenu } from "@/app/machines/hooks"; import type { MachineMenuToggleHandler } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine, MachineMeta } from "@/app/store/machine/types"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; diff --git a/src/app/machines/views/MachineList/MachineListTable/PowerColumn/PowerColumn.tsx b/src/app/machines/views/MachineList/MachineListTable/PowerColumn/PowerColumn.tsx index 3809c8a0182..ae819066efb 100644 --- a/src/app/machines/views/MachineList/MachineListTable/PowerColumn/PowerColumn.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/PowerColumn/PowerColumn.tsx @@ -8,7 +8,7 @@ import PowerIcon from "@/app/base/components/PowerIcon"; import { useToggleMenu } from "@/app/machines/hooks"; import type { MachineMenuToggleHandler } from "@/app/machines/types"; import { PowerTypeNames } from "@/app/store/general/constants"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/machines/views/MachineList/MachineListTable/ZoneColumn/ZoneColumn.tsx b/src/app/machines/views/MachineList/MachineListTable/ZoneColumn/ZoneColumn.tsx index 2b05484be9b..450c45644bd 100644 --- a/src/app/machines/views/MachineList/MachineListTable/ZoneColumn/ZoneColumn.tsx +++ b/src/app/machines/views/MachineList/MachineListTable/ZoneColumn/ZoneColumn.tsx @@ -8,7 +8,7 @@ import DoubleRow from "@/app/base/components/DoubleRow"; import urls from "@/app/base/urls"; import { useToggleMenu } from "@/app/machines/hooks"; import type { MachineMenuToggleHandler } from "@/app/machines/types"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { Machine, MachineMeta } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/machines/views/Machines.test.tsx b/src/app/machines/views/Machines.test.tsx index 28496ebf3fa..cc6dca95d77 100644 --- a/src/app/machines/views/Machines.test.tsx +++ b/src/app/machines/views/Machines.test.tsx @@ -10,7 +10,7 @@ import { Label } from "./MachineList/MachineListTable/GroupColumn"; import { DEFAULTS } from "./MachineList/MachineListTable/constants"; import Machines from "./Machines"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { FetchGroupKey, FilterGroupKey } from "@/app/store/machine/types"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/networkDiscovery/views/DiscoveriesList/DiscoveriesList.tsx b/src/app/networkDiscovery/views/DiscoveriesList/DiscoveriesList.tsx index bcb3276fa4b..3da80adfd54 100644 --- a/src/app/networkDiscovery/views/DiscoveriesList/DiscoveriesList.tsx +++ b/src/app/networkDiscovery/views/DiscoveriesList/DiscoveriesList.tsx @@ -19,7 +19,7 @@ import TooltipButton from "@/app/base/components/TooltipButton"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; import type { SetSidePanelContent } from "@/app/base/side-panel-context"; import { useSidePanel } from "@/app/base/side-panel-context"; -import { actions as discoveryActions } from "@/app/store/discovery"; +import { discoveryActions } from "@/app/store/discovery"; import discoverySelectors from "@/app/store/discovery/selectors"; import type { Discovery } from "@/app/store/discovery/types"; import { DiscoveryMeta } from "@/app/store/discovery/types"; diff --git a/src/app/networkDiscovery/views/DiscoveryAddForm/DiscoveryAddForm.test.tsx b/src/app/networkDiscovery/views/DiscoveryAddForm/DiscoveryAddForm.test.tsx index d0de50fe2ed..97a0a37aaec 100644 --- a/src/app/networkDiscovery/views/DiscoveryAddForm/DiscoveryAddForm.test.tsx +++ b/src/app/networkDiscovery/views/DiscoveryAddForm/DiscoveryAddForm.test.tsx @@ -6,7 +6,7 @@ import DiscoveryAddForm, { import { Labels as FormFieldLabels } from "./DiscoveryAddFormFields/DiscoveryAddFormFields"; import { DeviceType } from "./types"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import { DeviceIpAssignment, DeviceMeta } from "@/app/store/device/types"; import type { Discovery } from "@/app/store/discovery/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/networkDiscovery/views/DiscoveryAddForm/DiscoveryAddForm.tsx b/src/app/networkDiscovery/views/DiscoveryAddForm/DiscoveryAddForm.tsx index 93bc525f964..389b86eb325 100644 --- a/src/app/networkDiscovery/views/DiscoveryAddForm/DiscoveryAddForm.tsx +++ b/src/app/networkDiscovery/views/DiscoveryAddForm/DiscoveryAddForm.tsx @@ -13,21 +13,21 @@ import FormikForm from "@/app/base/components/FormikForm"; import { useFetchActions, useCycled } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import { hostnameValidation } from "@/app/base/validation"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { CreateInterfaceParams, Device } from "@/app/store/device/types"; import { DeviceIpAssignment, DeviceMeta } from "@/app/store/device/types"; -import { actions as discoveryActions } from "@/app/store/discovery"; +import { discoveryActions } from "@/app/store/discovery"; import type { Discovery } from "@/app/store/discovery/types"; -import { actions as domainActions } from "@/app/store/domain"; +import { domainActions } from "@/app/store/domain"; import domainSelectors from "@/app/store/domain/selectors"; import { useFetchMachines } from "@/app/store/machine/utils/hooks"; -import { actions as messageActions } from "@/app/store/message"; +import { messageActions } from "@/app/store/message"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import { FetchNodeStatus } from "@/app/store/types/node"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import { preparePayload } from "@/app/utils"; diff --git a/src/app/networkDiscovery/views/DiscoveryDeleteForm/DiscoveryDeleteForm.test.tsx b/src/app/networkDiscovery/views/DiscoveryDeleteForm/DiscoveryDeleteForm.test.tsx index fee18d2b2e1..114b8ca2bbe 100644 --- a/src/app/networkDiscovery/views/DiscoveryDeleteForm/DiscoveryDeleteForm.test.tsx +++ b/src/app/networkDiscovery/views/DiscoveryDeleteForm/DiscoveryDeleteForm.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import DiscoveryDeleteForm from "./DiscoveryDeleteForm"; -import { actions as discoveryActions } from "@/app/store/discovery"; +import { discoveryActions } from "@/app/store/discovery"; import type { Discovery } from "@/app/store/discovery/types"; import type { RootState } from "@/app/store/root/types"; import { diff --git a/src/app/networkDiscovery/views/DiscoveryDeleteForm/DiscoveryDeleteForm.tsx b/src/app/networkDiscovery/views/DiscoveryDeleteForm/DiscoveryDeleteForm.tsx index 246773c4241..5083dd3a06d 100644 --- a/src/app/networkDiscovery/views/DiscoveryDeleteForm/DiscoveryDeleteForm.tsx +++ b/src/app/networkDiscovery/views/DiscoveryDeleteForm/DiscoveryDeleteForm.tsx @@ -1,7 +1,7 @@ import { useDispatch, useSelector } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; -import { actions as discoveryActions } from "@/app/store/discovery"; +import { discoveryActions } from "@/app/store/discovery"; import discoverySelectors from "@/app/store/discovery/selectors"; import type { Discovery } from "@/app/store/discovery/types"; diff --git a/src/app/networkDiscovery/views/NetworkDiscoveryConfigurationForm/NetworkDiscoveryConfigurationSubnetForm/NetworkDiscoveryConfigurationSubnetForm.test.tsx b/src/app/networkDiscovery/views/NetworkDiscoveryConfigurationForm/NetworkDiscoveryConfigurationSubnetForm/NetworkDiscoveryConfigurationSubnetForm.test.tsx index 8e840c48677..4b194a9e3dd 100644 --- a/src/app/networkDiscovery/views/NetworkDiscoveryConfigurationForm/NetworkDiscoveryConfigurationSubnetForm/NetworkDiscoveryConfigurationSubnetForm.test.tsx +++ b/src/app/networkDiscovery/views/NetworkDiscoveryConfigurationForm/NetworkDiscoveryConfigurationSubnetForm/NetworkDiscoveryConfigurationSubnetForm.test.tsx @@ -6,7 +6,7 @@ import NetworkDiscoveryConfigurationSubnetForm, { import { ConfigNames, NetworkDiscovery } from "@/app/store/config/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import * as factory from "@/testing/factories"; import { userEvent, screen, renderWithBrowserRouter } from "@/testing/utils"; diff --git a/src/app/networkDiscovery/views/NetworkDiscoveryConfigurationForm/NetworkDiscoveryConfigurationSubnetForm/NetworkDiscoveryConfigurationSubnetForm.tsx b/src/app/networkDiscovery/views/NetworkDiscoveryConfigurationForm/NetworkDiscoveryConfigurationSubnetForm/NetworkDiscoveryConfigurationSubnetForm.tsx index d5f8df0c0d4..809b1fe70bb 100644 --- a/src/app/networkDiscovery/views/NetworkDiscoveryConfigurationForm/NetworkDiscoveryConfigurationSubnetForm/NetworkDiscoveryConfigurationSubnetForm.tsx +++ b/src/app/networkDiscovery/views/NetworkDiscoveryConfigurationForm/NetworkDiscoveryConfigurationSubnetForm/NetworkDiscoveryConfigurationSubnetForm.tsx @@ -8,9 +8,9 @@ import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import configSelectors from "@/app/store/config/selectors"; import { NetworkDiscovery } from "@/app/store/config/types"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; import { simpleSortByKey } from "@/app/utils"; diff --git a/src/app/networkDiscovery/views/NetworkDiscoveryHeader/ClearAllForm/ClearAllForm.tsx b/src/app/networkDiscovery/views/NetworkDiscoveryHeader/ClearAllForm/ClearAllForm.tsx index d5e8b0b86ae..e863fc63cd9 100644 --- a/src/app/networkDiscovery/views/NetworkDiscoveryHeader/ClearAllForm/ClearAllForm.tsx +++ b/src/app/networkDiscovery/views/NetworkDiscoveryHeader/ClearAllForm/ClearAllForm.tsx @@ -12,9 +12,9 @@ import docsUrls from "@/app/base/docsUrls"; import type { EmptyObject } from "@/app/base/types"; import configSelectors from "@/app/store/config/selectors"; import { NetworkDiscovery } from "@/app/store/config/types"; -import { actions as discoveryActions } from "@/app/store/discovery"; +import { discoveryActions } from "@/app/store/discovery"; import discoverySelectors from "@/app/store/discovery/selectors"; -import { actions as messageActions } from "@/app/store/message"; +import { messageActions } from "@/app/store/message"; export enum Labels { SubmitLabel = "Clear all discoveries", diff --git a/src/app/networkDiscovery/views/NetworkDiscoveryHeader/NetworkDiscoveryHeader.tsx b/src/app/networkDiscovery/views/NetworkDiscoveryHeader/NetworkDiscoveryHeader.tsx index 123adff830c..071876998ca 100644 --- a/src/app/networkDiscovery/views/NetworkDiscoveryHeader/NetworkDiscoveryHeader.tsx +++ b/src/app/networkDiscovery/views/NetworkDiscoveryHeader/NetworkDiscoveryHeader.tsx @@ -10,7 +10,7 @@ import SectionHeader from "@/app/base/components/SectionHeader"; import { useFetchActions } from "@/app/base/hooks"; import type { SetSidePanelContent } from "@/app/base/side-panel-context"; import urls from "@/app/base/urls"; -import { actions as discoveryActions } from "@/app/store/discovery"; +import { discoveryActions } from "@/app/store/discovery"; import discoverySelectors from "@/app/store/discovery/selectors"; export enum Labels { diff --git a/src/app/pools/components/PoolDeleteForm/PoolDeleteForm.tsx b/src/app/pools/components/PoolDeleteForm/PoolDeleteForm.tsx index 29071f78d9d..e5f40b50f5f 100644 --- a/src/app/pools/components/PoolDeleteForm/PoolDeleteForm.tsx +++ b/src/app/pools/components/PoolDeleteForm/PoolDeleteForm.tsx @@ -5,7 +5,7 @@ import { useNavigate } from "react-router-dom-v5-compat"; import ModelActionForm from "@/app/base/components/ModelActionForm"; import { useAddMessage } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/pools/components/PoolForm/PoolForm.test.tsx b/src/app/pools/components/PoolForm/PoolForm.test.tsx index edac1efbbb7..a513d21fa89 100644 --- a/src/app/pools/components/PoolForm/PoolForm.test.tsx +++ b/src/app/pools/components/PoolForm/PoolForm.test.tsx @@ -6,7 +6,7 @@ import configureStore from "redux-mock-store"; import { PoolForm, Labels as PoolFormLabels } from "./PoolForm"; import urls from "@/app/base/urls"; -import { actions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { @@ -56,7 +56,7 @@ describe("PoolForm", () => { unmount(); - expect(store.getActions()[0]).toEqual(actions.cleanup()); + expect(store.getActions()[0]).toEqual(resourcePoolActions.cleanup()); }); it("redirects when the resource pool is saved", () => { @@ -101,7 +101,10 @@ describe("PoolForm", () => { .find((action) => action.type === "resourcepool/create"); expect(action).toEqual( - actions.create({ name: "test name", description: "test description" }) + resourcePoolActions.create({ + name: "test name", + description: "test description", + }) ); }); @@ -143,7 +146,11 @@ describe("PoolForm", () => { .find((action) => action.type === "resourcepool/update"); expect(action).toEqual( - actions.update({ id: 1, name: "newName", description: "newDescription" }) + resourcePoolActions.update({ + id: 1, + name: "newName", + description: "newDescription", + }) ); }); diff --git a/src/app/pools/components/PoolForm/PoolForm.tsx b/src/app/pools/components/PoolForm/PoolForm.tsx index 45fdc4456bf..43d479cf221 100644 --- a/src/app/pools/components/PoolForm/PoolForm.tsx +++ b/src/app/pools/components/PoolForm/PoolForm.tsx @@ -7,7 +7,7 @@ import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import { useAddMessage } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as poolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import poolSelectors from "@/app/store/resourcepool/selectors"; import type { ResourcePool } from "@/app/store/resourcepool/types"; @@ -43,7 +43,7 @@ export const PoolForm = ({ pool, onClose, ...props }: Props): JSX.Element => { useAddMessage( saved, - poolActions.cleanup, + resourcePoolActions.cleanup, `${savingPool} ${pool ? "updated" : "added"} successfully.`, () => setSaving(null) ); @@ -67,7 +67,7 @@ export const PoolForm = ({ pool, onClose, ...props }: Props): JSX.Element => { return ( { label: "Add pool form", }} onSubmit={(values) => { - dispatch(poolActions.cleanup()); + dispatch(resourcePoolActions.cleanup()); if (pool) { dispatch( - poolActions.update({ + resourcePoolActions.update({ ...values, id: pool.id, }) ); } else { - dispatch(poolActions.create(values)); + dispatch(resourcePoolActions.create(values)); } setSaving(values.name); }} diff --git a/src/app/pools/views/PoolDelete/PoolDelete.test.tsx b/src/app/pools/views/PoolDelete/PoolDelete.test.tsx index a15c840a64c..7987e23421e 100644 --- a/src/app/pools/views/PoolDelete/PoolDelete.test.tsx +++ b/src/app/pools/views/PoolDelete/PoolDelete.test.tsx @@ -2,7 +2,7 @@ import configureStore from "redux-mock-store"; import PoolDelete from "./PoolDelete"; -import { actions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import type { RootState } from "@/app/store/root/types"; import * as factory from "@/testing/factories"; import { renderWithBrowserRouter, screen, userEvent } from "@/testing/utils"; @@ -40,5 +40,5 @@ it("can delete a resource pool", async () => { const action = store .getActions() .find((action) => action.type === "resourcepool/delete"); - expect(action).toEqual(actions.delete(1)); + expect(action).toEqual(resourcePoolActions.delete(1)); }); diff --git a/src/app/pools/views/PoolList/PoolList.tsx b/src/app/pools/views/PoolList/PoolList.tsx index fe7c71c913c..2f822ba56bd 100644 --- a/src/app/pools/views/PoolList/PoolList.tsx +++ b/src/app/pools/views/PoolList/PoolList.tsx @@ -12,7 +12,7 @@ import TableActions from "@/app/base/components/TableActions"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import { FilterMachines } from "@/app/store/machine/utils"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; import type { ResourcePool } from "@/app/store/resourcepool/types"; import { formatErrors } from "@/app/utils"; diff --git a/src/app/pools/views/Pools.tsx b/src/app/pools/views/Pools.tsx index 1c92e45b7f6..2095c44cc50 100644 --- a/src/app/pools/views/Pools.tsx +++ b/src/app/pools/views/Pools.tsx @@ -14,7 +14,7 @@ import NotFound from "@/app/base/views/NotFound"; import PoolAdd from "@/app/pools/views/PoolAdd"; import PoolEdit from "@/app/pools/views/PoolEdit"; import { useFetchMachineCount } from "@/app/store/machine/utils/hooks"; -import { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import { resourcePoolActions } from "@/app/store/resourcepool"; import resourcePoolSelectors from "@/app/store/resourcepool/selectors"; import { getRelativeRoute } from "@/app/utils"; diff --git a/src/app/preferences/views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx b/src/app/preferences/views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx index a1e3dfcb4d7..117117beabb 100644 --- a/src/app/preferences/views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx +++ b/src/app/preferences/views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx @@ -4,7 +4,7 @@ import { useNavigate } from "react-router-dom-v5-compat"; import ModelActionForm from "@/app/base/components/ModelActionForm"; import { useAddMessage } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as tokenActions } from "@/app/store/token"; +import { tokenActions } from "@/app/store/token"; import tokenSelectors from "@/app/store/token/selectors"; const APIKeyDeleteForm = ({ id }: { id: number }) => { diff --git a/src/app/preferences/views/APIKeys/APIKeyEdit/APIKeyEdit.tsx b/src/app/preferences/views/APIKeys/APIKeyEdit/APIKeyEdit.tsx index 336791bd5e4..719b0d3a1b5 100644 --- a/src/app/preferences/views/APIKeys/APIKeyEdit/APIKeyEdit.tsx +++ b/src/app/preferences/views/APIKeys/APIKeyEdit/APIKeyEdit.tsx @@ -6,7 +6,7 @@ import APIKeyForm from "../APIKeyForm"; import { useFetchActions } from "@/app/base/hooks"; import { useGetURLId } from "@/app/base/hooks/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as tokenActions } from "@/app/store/token"; +import { tokenActions } from "@/app/store/token"; import tokenSelectors from "@/app/store/token/selectors"; import { TokenMeta } from "@/app/store/token/types"; diff --git a/src/app/preferences/views/APIKeys/APIKeyForm/APIKeyForm.tsx b/src/app/preferences/views/APIKeys/APIKeyForm/APIKeyForm.tsx index 31e44879994..8cfb223f761 100644 --- a/src/app/preferences/views/APIKeys/APIKeyForm/APIKeyForm.tsx +++ b/src/app/preferences/views/APIKeys/APIKeyForm/APIKeyForm.tsx @@ -7,7 +7,7 @@ import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import { useAddMessage } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as tokenActions } from "@/app/store/token"; +import { tokenActions } from "@/app/store/token"; import tokenSelectors from "@/app/store/token/selectors"; import type { Token } from "@/app/store/token/types"; diff --git a/src/app/preferences/views/APIKeys/APIKeyList/APIKeyList.tsx b/src/app/preferences/views/APIKeys/APIKeyList/APIKeyList.tsx index e2b687dca7d..08bd285bcfc 100644 --- a/src/app/preferences/views/APIKeys/APIKeyList/APIKeyList.tsx +++ b/src/app/preferences/views/APIKeys/APIKeyList/APIKeyList.tsx @@ -5,7 +5,7 @@ import TableActions from "@/app/base/components/TableActions"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import SettingsTable from "@/app/settings/components/SettingsTable"; -import { actions as tokenActions } from "@/app/store/token"; +import { tokenActions } from "@/app/store/token"; import tokenSelectors from "@/app/store/token/selectors"; import type { Token } from "@/app/store/token/types"; diff --git a/src/app/preferences/views/Details/Details.tsx b/src/app/preferences/views/Details/Details.tsx index f7c6da132e0..de2fd974891 100644 --- a/src/app/preferences/views/Details/Details.tsx +++ b/src/app/preferences/views/Details/Details.tsx @@ -6,10 +6,10 @@ import { useDispatch, useSelector } from "react-redux"; import UserForm from "@/app/base/components/UserForm"; import { useAddMessage, useWindowTitle } from "@/app/base/hooks"; -import { actions as authActions } from "@/app/store/auth"; +import { authActions } from "@/app/store/auth"; import authSelectors from "@/app/store/auth/selectors"; import statusSelectors from "@/app/store/status/selectors"; -import { actions as userActions } from "@/app/store/user"; +import { userActions } from "@/app/store/user"; import userSelectors from "@/app/store/user/selectors"; export enum Label { diff --git a/src/app/preferences/views/SSHKeys/DeleteSSHKey/DeleteSSHKey.tsx b/src/app/preferences/views/SSHKeys/DeleteSSHKey/DeleteSSHKey.tsx index 62776bc680c..3fc7f74f240 100644 --- a/src/app/preferences/views/SSHKeys/DeleteSSHKey/DeleteSSHKey.tsx +++ b/src/app/preferences/views/SSHKeys/DeleteSSHKey/DeleteSSHKey.tsx @@ -7,7 +7,7 @@ import { useNavigate, useSearchParams } from "react-router-dom-v5-compat"; import ModelActionForm from "@/app/base/components/ModelActionForm"; import { useAddMessage } from "@/app/base/hooks"; import urls from "@/app/preferences/urls"; -import { actions as sshkeyActions } from "@/app/store/sshkey"; +import { sshkeyActions } from "@/app/store/sshkey"; import sshkeySelectors from "@/app/store/sshkey/selectors"; import type { SSHKey, SSHKeyMeta } from "@/app/store/sshkey/types"; diff --git a/src/app/preferences/views/SSLKeys/AddSSLKey/AddSSLKey.tsx b/src/app/preferences/views/SSLKeys/AddSSLKey/AddSSLKey.tsx index 40adc27d8a1..dd304dd53e7 100644 --- a/src/app/preferences/views/SSLKeys/AddSSLKey/AddSSLKey.tsx +++ b/src/app/preferences/views/SSLKeys/AddSSLKey/AddSSLKey.tsx @@ -13,7 +13,7 @@ import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import { useAddMessage } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as sslkeyActions } from "@/app/store/sslkey"; +import { sslkeyActions } from "@/app/store/sslkey"; import sslkeySelectors from "@/app/store/sslkey/selectors"; export enum Label { diff --git a/src/app/preferences/views/SSLKeys/DeleteSSLKey/DeleteSSLKey.tsx b/src/app/preferences/views/SSLKeys/DeleteSSLKey/DeleteSSLKey.tsx index 27cc0da5167..e904383951a 100644 --- a/src/app/preferences/views/SSLKeys/DeleteSSLKey/DeleteSSLKey.tsx +++ b/src/app/preferences/views/SSLKeys/DeleteSSLKey/DeleteSSLKey.tsx @@ -6,7 +6,7 @@ import ModelActionForm from "@/app/base/components/ModelActionForm"; import { useAddMessage, useGetURLId } from "@/app/base/hooks"; import urls from "@/app/preferences/urls"; import { Label } from "@/app/preferences/views/SSLKeys/SSLKeyList/SSLKeyList"; -import { actions as sslkeyActions } from "@/app/store/sslkey"; +import { sslkeyActions } from "@/app/store/sslkey"; import sslkeySelectors from "@/app/store/sslkey/selectors"; import { isId } from "@/app/utils"; diff --git a/src/app/preferences/views/SSLKeys/SSLKeyList/SSLKeyList.tsx b/src/app/preferences/views/SSLKeys/SSLKeyList/SSLKeyList.tsx index cdd4f94ee1d..84f7f9c40bc 100644 --- a/src/app/preferences/views/SSLKeys/SSLKeyList/SSLKeyList.tsx +++ b/src/app/preferences/views/SSLKeys/SSLKeyList/SSLKeyList.tsx @@ -5,7 +5,7 @@ import TableActions from "@/app/base/components/TableActions"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import SettingsTable from "@/app/settings/components/SettingsTable"; -import { actions as sslkeyActions } from "@/app/store/sslkey"; +import { sslkeyActions } from "@/app/store/sslkey"; import sslkeySelectors from "@/app/store/sslkey/selectors"; import type { SSLKey } from "@/app/store/sslkey/types"; diff --git a/src/app/settings/hooks.ts b/src/app/settings/hooks.ts index 0c7f5d962d1..cfd32cae64a 100644 --- a/src/app/settings/hooks.ts +++ b/src/app/settings/hooks.ts @@ -1,19 +1,19 @@ import { useSelector } from "react-redux"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import type { Controller } from "@/app/store/controller/types"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { Device } from "@/app/store/device/types"; import type { DHCPSnippet } from "@/app/store/dhcpsnippet/types"; -import { actions as ipRangeActions } from "@/app/store/iprange"; +import { ipRangeActions } from "@/app/store/iprange"; import ipRangeSelectors from "@/app/store/iprange/selectors"; import type { Machine } from "@/app/store/machine/types"; import { useFetchMachine } from "@/app/store/machine/utils/hooks"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; diff --git a/src/app/settings/views/Configuration/Commissioning/Commissioning.tsx b/src/app/settings/views/Configuration/Commissioning/Commissioning.tsx index d6b1488af8d..d72cf9704d9 100644 --- a/src/app/settings/views/Configuration/Commissioning/Commissioning.tsx +++ b/src/app/settings/views/Configuration/Commissioning/Commissioning.tsx @@ -7,9 +7,9 @@ import { useSelector, useDispatch } from "react-redux"; import CommissioningForm from "../CommissioningForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { osInfo as osInfoSelectors } from "@/app/store/general/selectors"; export enum Labels { diff --git a/src/app/settings/views/Configuration/CommissioningForm/CommissioningForm.tsx b/src/app/settings/views/Configuration/CommissioningForm/CommissioningForm.tsx index 6bc0d9de19c..f15e98c2c50 100644 --- a/src/app/settings/views/Configuration/CommissioningForm/CommissioningForm.tsx +++ b/src/app/settings/views/Configuration/CommissioningForm/CommissioningForm.tsx @@ -4,7 +4,7 @@ import * as Yup from "yup"; import Fields from "../CommissioningFormFields"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; const CommissioningSchema = Yup.object().shape({ diff --git a/src/app/settings/views/Configuration/Deploy/Deploy.tsx b/src/app/settings/views/Configuration/Deploy/Deploy.tsx index f9c64cb6557..99b06914979 100644 --- a/src/app/settings/views/Configuration/Deploy/Deploy.tsx +++ b/src/app/settings/views/Configuration/Deploy/Deploy.tsx @@ -6,9 +6,9 @@ import { useSelector, useDispatch } from "react-redux"; import { useWindowTitle } from "@/app/base/hooks"; import DeployForm from "@/app/settings/views/Configuration/DeployForm"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { osInfo as osInfoSelectors } from "@/app/store/general/selectors"; const Deploy = (): JSX.Element => { diff --git a/src/app/settings/views/Configuration/DeployForm/DeployForm.tsx b/src/app/settings/views/Configuration/DeployForm/DeployForm.tsx index 27ec61ebad1..2117f3c53bf 100644 --- a/src/app/settings/views/Configuration/DeployForm/DeployForm.tsx +++ b/src/app/settings/views/Configuration/DeployForm/DeployForm.tsx @@ -5,7 +5,7 @@ import type { DeployFormValues } from "./types"; import FormikForm from "@/app/base/components/FormikForm"; import DeployFormFields from "@/app/settings/views/Configuration/DeployFormFields"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; import { timeSpanToMinutes } from "@/app/utils"; diff --git a/src/app/settings/views/Configuration/General/General.tsx b/src/app/settings/views/Configuration/General/General.tsx index 41432df7ec0..e6f7a9c5d8e 100644 --- a/src/app/settings/views/Configuration/General/General.tsx +++ b/src/app/settings/views/Configuration/General/General.tsx @@ -7,7 +7,7 @@ import { useDispatch, useSelector } from "react-redux"; import GeneralForm from "../GeneralForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; export enum Labels { diff --git a/src/app/settings/views/Configuration/GeneralForm/GeneralForm.tsx b/src/app/settings/views/Configuration/GeneralForm/GeneralForm.tsx index 01b043ebf0d..e15d78c859d 100644 --- a/src/app/settings/views/Configuration/GeneralForm/GeneralForm.tsx +++ b/src/app/settings/views/Configuration/GeneralForm/GeneralForm.tsx @@ -14,7 +14,7 @@ import FormikForm from "@/app/base/components/FormikForm"; import { useSendAnalytics } from "@/app/base/hooks"; import { useThemeContext } from "@/app/base/theme-context"; import type { UsabillaLive } from "@/app/base/types"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; declare global { diff --git a/src/app/settings/views/Configuration/KernelParameters/KernelParameters.tsx b/src/app/settings/views/Configuration/KernelParameters/KernelParameters.tsx index 041aa13d25e..e89433c58b7 100644 --- a/src/app/settings/views/Configuration/KernelParameters/KernelParameters.tsx +++ b/src/app/settings/views/Configuration/KernelParameters/KernelParameters.tsx @@ -7,7 +7,7 @@ import { useDispatch, useSelector } from "react-redux"; import KernelParametersForm from "../KernelParametersForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; export enum Labels { diff --git a/src/app/settings/views/Configuration/KernelParametersForm/KernelParametersForm.tsx b/src/app/settings/views/Configuration/KernelParametersForm/KernelParametersForm.tsx index 765e992e2ac..de25597ec8f 100644 --- a/src/app/settings/views/Configuration/KernelParametersForm/KernelParametersForm.tsx +++ b/src/app/settings/views/Configuration/KernelParametersForm/KernelParametersForm.tsx @@ -3,7 +3,7 @@ import * as Yup from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; type KernelParametersValues = { diff --git a/src/app/settings/views/Dhcp/DhcpEdit/DhcpEdit.tsx b/src/app/settings/views/Dhcp/DhcpEdit/DhcpEdit.tsx index 0c07e2b26d4..9e8c2bc4fd4 100644 --- a/src/app/settings/views/Dhcp/DhcpEdit/DhcpEdit.tsx +++ b/src/app/settings/views/Dhcp/DhcpEdit/DhcpEdit.tsx @@ -5,7 +5,7 @@ import DhcpForm from "../DhcpForm"; import { useFetchActions } from "@/app/base/hooks"; import { useGetURLId } from "@/app/base/hooks/urls"; -import { actions as dhcpsnippetActions } from "@/app/store/dhcpsnippet"; +import { dhcpsnippetActions } from "@/app/store/dhcpsnippet"; import dhcpsnippetSelectors from "@/app/store/dhcpsnippet/selectors"; import { DHCPSnippetMeta } from "@/app/store/dhcpsnippet/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/settings/views/Dhcp/DhcpList/DhcpList.tsx b/src/app/settings/views/Dhcp/DhcpList/DhcpList.tsx index 4b5235fb700..16d2f7d5c11 100644 --- a/src/app/settings/views/Dhcp/DhcpList/DhcpList.tsx +++ b/src/app/settings/views/Dhcp/DhcpList/DhcpList.tsx @@ -15,13 +15,13 @@ import { useWindowTitle, useAddMessage } from "@/app/base/hooks"; import SettingsTable from "@/app/settings/components/SettingsTable"; import settingsURLs from "@/app/settings/urls"; import DhcpTarget from "@/app/settings/views/Dhcp/DhcpTarget"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import type { Controller } from "@/app/store/controller/types"; -import { actions as deviceActions } from "@/app/store/device"; +import { deviceActions } from "@/app/store/device"; import deviceSelectors from "@/app/store/device/selectors"; import type { Device } from "@/app/store/device/types"; -import { actions as dhcpsnippetActions } from "@/app/store/dhcpsnippet"; +import { dhcpsnippetActions } from "@/app/store/dhcpsnippet"; import dhcpsnippetSelectors from "@/app/store/dhcpsnippet/selectors"; import type { DHCPSnippet, @@ -31,7 +31,7 @@ import type { import machineSelectors from "@/app/store/machine/selectors"; import type { Machine } from "@/app/store/machine/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; diff --git a/src/app/settings/views/Images/ThirdPartyDrivers/ThirdPartyDrivers.tsx b/src/app/settings/views/Images/ThirdPartyDrivers/ThirdPartyDrivers.tsx index 429f209795a..26084c7580a 100644 --- a/src/app/settings/views/Images/ThirdPartyDrivers/ThirdPartyDrivers.tsx +++ b/src/app/settings/views/Images/ThirdPartyDrivers/ThirdPartyDrivers.tsx @@ -7,7 +7,7 @@ import { useDispatch, useSelector } from "react-redux"; import ThirdPartyDriversForm from "../ThirdPartyDriversForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; export enum Labels { diff --git a/src/app/settings/views/Images/ThirdPartyDriversForm/ThirdPartyDriversForm.tsx b/src/app/settings/views/Images/ThirdPartyDriversForm/ThirdPartyDriversForm.tsx index 922a2443c67..c702843f4c6 100644 --- a/src/app/settings/views/Images/ThirdPartyDriversForm/ThirdPartyDriversForm.tsx +++ b/src/app/settings/views/Images/ThirdPartyDriversForm/ThirdPartyDriversForm.tsx @@ -3,7 +3,7 @@ import * as Yup from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; const ThirdPartyDriversSchema = Yup.object().shape({ diff --git a/src/app/settings/views/Images/VMWare/VMWare.tsx b/src/app/settings/views/Images/VMWare/VMWare.tsx index aab58a0512e..bb1a4e35e98 100644 --- a/src/app/settings/views/Images/VMWare/VMWare.tsx +++ b/src/app/settings/views/Images/VMWare/VMWare.tsx @@ -7,7 +7,7 @@ import { useDispatch, useSelector } from "react-redux"; import VMWareForm from "../VMWareForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; export enum Labels { diff --git a/src/app/settings/views/Images/VMWareForm/VMWareForm.tsx b/src/app/settings/views/Images/VMWareForm/VMWareForm.tsx index b1f602f375b..20be16cb62c 100644 --- a/src/app/settings/views/Images/VMWareForm/VMWareForm.tsx +++ b/src/app/settings/views/Images/VMWareForm/VMWareForm.tsx @@ -3,7 +3,7 @@ import * as Yup from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; const VMWareSchema = Yup.object().shape({ diff --git a/src/app/settings/views/Images/Windows/Windows.tsx b/src/app/settings/views/Images/Windows/Windows.tsx index 23f3560277e..01c9574abd7 100644 --- a/src/app/settings/views/Images/Windows/Windows.tsx +++ b/src/app/settings/views/Images/Windows/Windows.tsx @@ -7,7 +7,7 @@ import { useDispatch, useSelector } from "react-redux"; import WindowsForm from "../WindowsForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; export enum Labels { diff --git a/src/app/settings/views/Images/WindowsForm/WindowsForm.tsx b/src/app/settings/views/Images/WindowsForm/WindowsForm.tsx index 44137b3aa18..227cbbc78c8 100644 --- a/src/app/settings/views/Images/WindowsForm/WindowsForm.tsx +++ b/src/app/settings/views/Images/WindowsForm/WindowsForm.tsx @@ -3,7 +3,7 @@ import * as Yup from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; const WindowsSchema = Yup.object().shape({ diff --git a/src/app/settings/views/LicenseKeys/LicenseKeyEdit/LicenseKeyEdit.tsx b/src/app/settings/views/LicenseKeys/LicenseKeyEdit/LicenseKeyEdit.tsx index f4391b13265..e64fb052205 100644 --- a/src/app/settings/views/LicenseKeys/LicenseKeyEdit/LicenseKeyEdit.tsx +++ b/src/app/settings/views/LicenseKeys/LicenseKeyEdit/LicenseKeyEdit.tsx @@ -5,7 +5,7 @@ import { useParams } from "react-router-dom-v5-compat"; import LicenseKeyForm from "../LicenseKeyForm"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as licenseKeysActions } from "@/app/store/licensekeys"; +import { licenseKeysActions } from "@/app/store/licensekeys"; import licenseKeysSelectors from "@/app/store/licensekeys/selectors"; import type { LicenseKeys } from "@/app/store/licensekeys/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/settings/views/LicenseKeys/LicenseKeyForm/LicenseKeyForm.tsx b/src/app/settings/views/LicenseKeys/LicenseKeyForm/LicenseKeyForm.tsx index ea0ce46cb77..478998d7841 100644 --- a/src/app/settings/views/LicenseKeys/LicenseKeyForm/LicenseKeyForm.tsx +++ b/src/app/settings/views/LicenseKeys/LicenseKeyForm/LicenseKeyForm.tsx @@ -12,9 +12,9 @@ import type { LicenseKeyFormValues } from "./types"; import FormikForm from "@/app/base/components/FormikForm"; import { useAddMessage } from "@/app/base/hooks"; import settingsURLs from "@/app/settings/urls"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { osInfo as osInfoSelectors } from "@/app/store/general/selectors"; -import { actions as licenseKeysActions } from "@/app/store/licensekeys"; +import { licenseKeysActions } from "@/app/store/licensekeys"; import licenseKeysSelectors from "@/app/store/licensekeys/selectors"; import type { LicenseKeys } from "@/app/store/licensekeys/types"; import { LicenseKeysMeta } from "@/app/store/licensekeys/types"; diff --git a/src/app/settings/views/LicenseKeys/LicenseKeyList/LicenseKeyList.tsx b/src/app/settings/views/LicenseKeys/LicenseKeyList/LicenseKeyList.tsx index 4bc2f919d00..6b535f2f5a1 100644 --- a/src/app/settings/views/LicenseKeys/LicenseKeyList/LicenseKeyList.tsx +++ b/src/app/settings/views/LicenseKeys/LicenseKeyList/LicenseKeyList.tsx @@ -13,9 +13,9 @@ import { } from "@/app/base/hooks"; import SettingsTable from "@/app/settings/components/SettingsTable"; import settingsURLs from "@/app/settings/urls"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { osInfo as osInfoSelectors } from "@/app/store/general/selectors"; -import { actions as licenseKeysActions } from "@/app/store/licensekeys"; +import { licenseKeysActions } from "@/app/store/licensekeys"; import licenseKeysSelectors from "@/app/store/licensekeys/selectors"; import type { LicenseKeys, diff --git a/src/app/settings/views/Network/DnsForm/DnsForm.tsx b/src/app/settings/views/Network/DnsForm/DnsForm.tsx index a5456a78532..94fb183c7d9 100644 --- a/src/app/settings/views/Network/DnsForm/DnsForm.tsx +++ b/src/app/settings/views/Network/DnsForm/DnsForm.tsx @@ -8,7 +8,7 @@ import * as Yup from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; const DnsSchema = Yup.object().shape({ diff --git a/src/app/settings/views/Network/NetworkDiscoveryForm/NetworkDiscoveryForm.tsx b/src/app/settings/views/Network/NetworkDiscoveryForm/NetworkDiscoveryForm.tsx index 38aeea9faff..4a5eb6761e6 100644 --- a/src/app/settings/views/Network/NetworkDiscoveryForm/NetworkDiscoveryForm.tsx +++ b/src/app/settings/views/Network/NetworkDiscoveryForm/NetworkDiscoveryForm.tsx @@ -10,7 +10,7 @@ import type { NetworkDiscoveryValues } from "./types"; import FormikForm from "@/app/base/components/FormikForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; import { NetworkDiscovery } from "@/app/store/config/types"; diff --git a/src/app/settings/views/Network/NtpForm/NtpForm.tsx b/src/app/settings/views/Network/NtpForm/NtpForm.tsx index 8d2dd772fc6..e13b9b7a4c3 100644 --- a/src/app/settings/views/Network/NtpForm/NtpForm.tsx +++ b/src/app/settings/views/Network/NtpForm/NtpForm.tsx @@ -8,7 +8,7 @@ import * as Yup from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; const NtpSchema = Yup.object().shape({ diff --git a/src/app/settings/views/Network/ProxyForm/ProxyForm.tsx b/src/app/settings/views/Network/ProxyForm/ProxyForm.tsx index 40276a04d29..07b04f61119 100644 --- a/src/app/settings/views/Network/ProxyForm/ProxyForm.tsx +++ b/src/app/settings/views/Network/ProxyForm/ProxyForm.tsx @@ -12,7 +12,7 @@ import type { ProxyFormValues } from "./types"; import FormikForm from "@/app/base/components/FormikForm"; import { useWindowTitle } from "@/app/base/hooks"; import { UrlSchema } from "@/app/base/validation"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; const ProxySchema = Yup.object().shape({ diff --git a/src/app/settings/views/Network/SyslogForm/SyslogForm.tsx b/src/app/settings/views/Network/SyslogForm/SyslogForm.tsx index 746eda36bdb..ed126ad8907 100644 --- a/src/app/settings/views/Network/SyslogForm/SyslogForm.tsx +++ b/src/app/settings/views/Network/SyslogForm/SyslogForm.tsx @@ -8,7 +8,7 @@ import * as Yup from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; const SyslogSchema = Yup.object().shape({ diff --git a/src/app/settings/views/Repositories/RepositoriesList/RepositoriesList.tsx b/src/app/settings/views/Repositories/RepositoriesList/RepositoriesList.tsx index ab42981a27f..eb9049c1eef 100644 --- a/src/app/settings/views/Repositories/RepositoriesList/RepositoriesList.tsx +++ b/src/app/settings/views/Repositories/RepositoriesList/RepositoriesList.tsx @@ -13,7 +13,7 @@ import { } from "@/app/base/hooks"; import SettingsTable from "@/app/settings/components/SettingsTable"; import settingsURLs from "@/app/settings/urls"; -import { actions as repositoryActions } from "@/app/store/packagerepository"; +import { repositoryActions } from "@/app/store/packagerepository"; import repositorySelectors from "@/app/store/packagerepository/selectors"; import type { PackageRepository, diff --git a/src/app/settings/views/Repositories/RepositoryEdit/RepositoryEdit.tsx b/src/app/settings/views/Repositories/RepositoryEdit/RepositoryEdit.tsx index abdf431c23f..51c9c3094f1 100644 --- a/src/app/settings/views/Repositories/RepositoryEdit/RepositoryEdit.tsx +++ b/src/app/settings/views/Repositories/RepositoryEdit/RepositoryEdit.tsx @@ -6,7 +6,7 @@ import RepositoryForm from "../RepositoryForm"; import { useFetchActions } from "@/app/base/hooks"; import { useGetURLId } from "@/app/base/hooks/urls"; -import { actions as repositoryActions } from "@/app/store/packagerepository"; +import { repositoryActions } from "@/app/store/packagerepository"; import repositorySelectors from "@/app/store/packagerepository/selectors"; import { ResourcePoolMeta } from "@/app/store/resourcepool/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/settings/views/Repositories/RepositoryForm/RepositoryForm.tsx b/src/app/settings/views/Repositories/RepositoryForm/RepositoryForm.tsx index c88dc2913e9..b71c333d03a 100644 --- a/src/app/settings/views/Repositories/RepositoryForm/RepositoryForm.tsx +++ b/src/app/settings/views/Repositories/RepositoryForm/RepositoryForm.tsx @@ -12,13 +12,13 @@ import type { RepositoryFormValues } from "./types"; import FormikForm from "@/app/base/components/FormikForm"; import { useAddMessage } from "@/app/base/hooks"; import settingsURLs from "@/app/settings/urls"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { componentsToDisable as componentsToDisableSelectors, knownArchitectures as knownArchitecturesSelectors, pocketsToDisable as pocketsToDisableSelectors, } from "@/app/store/general/selectors"; -import { actions as repositoryActions } from "@/app/store/packagerepository"; +import { repositoryActions } from "@/app/store/packagerepository"; import repositorySelectors from "@/app/store/packagerepository/selectors"; import type { CreateParams, diff --git a/src/app/settings/views/Scripts/ScriptDetails/ScriptDetails.tsx b/src/app/settings/views/Scripts/ScriptDetails/ScriptDetails.tsx index e162984fc63..2111fc02ed6 100644 --- a/src/app/settings/views/Scripts/ScriptDetails/ScriptDetails.tsx +++ b/src/app/settings/views/Scripts/ScriptDetails/ScriptDetails.tsx @@ -12,7 +12,7 @@ import { nanoid } from "@reduxjs/toolkit"; import { useDispatch, useSelector } from "react-redux"; import FileContext from "@/app/base/file-context"; -import { actions as scriptActions } from "@/app/store/script"; +import { scriptActions } from "@/app/store/script"; import scriptSelectors from "@/app/store/script/selectors"; import type { Script } from "@/app/store/script/types"; diff --git a/src/app/settings/views/Scripts/ScriptsList/ScriptsList.tsx b/src/app/settings/views/Scripts/ScriptsList/ScriptsList.tsx index a15336b70de..3ac9498df3d 100644 --- a/src/app/settings/views/Scripts/ScriptsList/ScriptsList.tsx +++ b/src/app/settings/views/Scripts/ScriptsList/ScriptsList.tsx @@ -13,7 +13,7 @@ import TableDeleteConfirm from "@/app/base/components/TableDeleteConfirm"; import { useWindowTitle, useAddMessage } from "@/app/base/hooks"; import SettingsTable from "@/app/settings/components/SettingsTable"; import type { RootState } from "@/app/store/root/types"; -import { actions as scriptActions } from "@/app/store/script"; +import { scriptActions } from "@/app/store/script"; import scriptSelectors from "@/app/store/script/selectors"; import type { Script } from "@/app/store/script/types"; import { generateEmptyStateMsg, getTableStatus } from "@/app/utils"; diff --git a/src/app/settings/views/Scripts/ScriptsUpload/ScriptsUpload.tsx b/src/app/settings/views/Scripts/ScriptsUpload/ScriptsUpload.tsx index 0195320d0fd..6c4e276e2cf 100644 --- a/src/app/settings/views/Scripts/ScriptsUpload/ScriptsUpload.tsx +++ b/src/app/settings/views/Scripts/ScriptsUpload/ScriptsUpload.tsx @@ -11,8 +11,8 @@ import type { ReadScriptResponse } from "./readScript"; import readScript from "./readScript"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as messageActions } from "@/app/store/message"; -import { actions as scriptActions } from "@/app/store/script"; +import { messageActions } from "@/app/store/message"; +import { scriptActions } from "@/app/store/script"; import scriptSelectors from "@/app/store/script/selectors"; import { ScriptType } from "@/app/store/script/types"; diff --git a/src/app/settings/views/Scripts/ScriptsUpload/readScript.tsx b/src/app/settings/views/Scripts/ScriptsUpload/readScript.tsx index 3273ee5914d..37ba035c8d8 100644 --- a/src/app/settings/views/Scripts/ScriptsUpload/readScript.tsx +++ b/src/app/settings/views/Scripts/ScriptsUpload/readScript.tsx @@ -2,7 +2,7 @@ import { NotificationSeverity } from "@canonical/react-components"; import type { FileWithPath } from "react-dropzone"; import type { Dispatch } from "redux"; -import { actions as messageActions } from "@/app/store/message"; +import { messageActions } from "@/app/store/message"; export type ReadScriptResponse = { name: string | null; diff --git a/src/app/settings/views/Security/IpmiSettings/IpmiSettings.tsx b/src/app/settings/views/Security/IpmiSettings/IpmiSettings.tsx index 6102b362d75..8dc48e74d9b 100644 --- a/src/app/settings/views/Security/IpmiSettings/IpmiSettings.tsx +++ b/src/app/settings/views/Security/IpmiSettings/IpmiSettings.tsx @@ -9,7 +9,7 @@ import Fields from "./IpmiFormFields"; import FormikForm from "@/app/base/components/FormikForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; import { AutoIpmiPrivilegeLevel } from "@/app/store/config/types"; diff --git a/src/app/settings/views/Security/SecretStorage/SecretStorage.tsx b/src/app/settings/views/Security/SecretStorage/SecretStorage.tsx index cc1fe303868..e59ea0a9e55 100644 --- a/src/app/settings/views/Security/SecretStorage/SecretStorage.tsx +++ b/src/app/settings/views/Security/SecretStorage/SecretStorage.tsx @@ -5,7 +5,7 @@ import { useSelector } from "react-redux"; import VaultSettings from "./VaultSettings"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { vaultEnabled as vaultEnabledSelectors } from "@/app/store/general/selectors"; const SecretStorage = (): JSX.Element => { diff --git a/src/app/settings/views/Security/SecretStorage/VaultSettings/VaultSettings.tsx b/src/app/settings/views/Security/SecretStorage/VaultSettings/VaultSettings.tsx index e6884c554d3..205f207634c 100644 --- a/src/app/settings/views/Security/SecretStorage/VaultSettings/VaultSettings.tsx +++ b/src/app/settings/views/Security/SecretStorage/VaultSettings/VaultSettings.tsx @@ -10,9 +10,9 @@ import { useSelector } from "react-redux"; import docsUrls from "@/app/base/docsUrls"; import { useFetchActions } from "@/app/base/hooks"; import { useId } from "@/app/base/hooks/base"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { vaultEnabled as vaultEnabledSelectors } from "@/app/store/general/selectors"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/settings/views/Security/SecurityProtocols/SecurityProtocols.tsx b/src/app/settings/views/Security/SecurityProtocols/SecurityProtocols.tsx index e7d2b86c3a1..3cb8b2de2c1 100644 --- a/src/app/settings/views/Security/SecurityProtocols/SecurityProtocols.tsx +++ b/src/app/settings/views/Security/SecurityProtocols/SecurityProtocols.tsx @@ -6,7 +6,7 @@ import TLSDisabled from "./TLSDisabled"; import TLSEnabled from "./TLSEnabled"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { tlsCertificate as tlsCertificateSelectors } from "@/app/store/general/selectors"; const SecurityProtocols = (): JSX.Element => { diff --git a/src/app/settings/views/Security/SecurityProtocols/TLSEnabled/TLSEnabled.test.tsx b/src/app/settings/views/Security/SecurityProtocols/TLSEnabled/TLSEnabled.test.tsx index 87169a09d51..2978b1d097f 100644 --- a/src/app/settings/views/Security/SecurityProtocols/TLSEnabled/TLSEnabled.test.tsx +++ b/src/app/settings/views/Security/SecurityProtocols/TLSEnabled/TLSEnabled.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import TLSEnabled, { Labels } from "./TLSEnabled"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import { ConfigNames } from "@/app/store/config/types"; import * as factory from "@/testing/factories"; import { userEvent, fireEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/settings/views/Security/SecurityProtocols/TLSEnabled/TLSEnabled.tsx b/src/app/settings/views/Security/SecurityProtocols/TLSEnabled/TLSEnabled.tsx index d0ab9d65c20..1c9729cf03e 100644 --- a/src/app/settings/views/Security/SecurityProtocols/TLSEnabled/TLSEnabled.tsx +++ b/src/app/settings/views/Security/SecurityProtocols/TLSEnabled/TLSEnabled.tsx @@ -6,7 +6,7 @@ import TLSEnabledFields from "./TLSEnabledFields"; import CertificateMetadata from "@/app/base/components/CertificateMetadata"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; import { TLSExpiryNotificationInterval } from "@/app/store/config/types"; import { tlsCertificate as tlsCertificateSelectors } from "@/app/store/general/selectors"; diff --git a/src/app/settings/views/Security/SessionTimeout/SessionTimeout.test.tsx b/src/app/settings/views/Security/SessionTimeout/SessionTimeout.test.tsx index 8b924ac8582..67e48cc42ec 100644 --- a/src/app/settings/views/Security/SessionTimeout/SessionTimeout.test.tsx +++ b/src/app/settings/views/Security/SessionTimeout/SessionTimeout.test.tsx @@ -5,7 +5,7 @@ import SessionTimeout, { Labels as SessionTimeoutLabels, } from "./SessionTimeout"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import type { RootState } from "@/app/store/root/types"; import { mockFormikFormSaved } from "@/testing/mockFormikFormSaved"; import { diff --git a/src/app/settings/views/Security/SessionTimeout/SessionTimeout.tsx b/src/app/settings/views/Security/SessionTimeout/SessionTimeout.tsx index c128458d6ba..3a43c3613d2 100644 --- a/src/app/settings/views/Security/SessionTimeout/SessionTimeout.tsx +++ b/src/app/settings/views/Security/SessionTimeout/SessionTimeout.tsx @@ -7,7 +7,7 @@ import * as Yup from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; import { humanReadableToSeconds, diff --git a/src/app/settings/views/Settings.tsx b/src/app/settings/views/Settings.tsx index d8df0d5fb16..98c55a2d2b5 100644 --- a/src/app/settings/views/Settings.tsx +++ b/src/app/settings/views/Settings.tsx @@ -5,7 +5,7 @@ import SectionHeader from "@/app/base/components/SectionHeader"; import { useFetchActions } from "@/app/base/hooks"; import Routes from "@/app/settings/components/Routes"; import authSelectors from "@/app/store/auth/selectors"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; const Settings = (): JSX.Element => { const isAdmin = useSelector(authSelectors.isAdmin); diff --git a/src/app/settings/views/Storage/StorageForm/StorageForm.tsx b/src/app/settings/views/Storage/StorageForm/StorageForm.tsx index 2926017570b..9dfe0e66e47 100644 --- a/src/app/settings/views/Storage/StorageForm/StorageForm.tsx +++ b/src/app/settings/views/Storage/StorageForm/StorageForm.tsx @@ -10,7 +10,7 @@ import type { StorageFormValues } from "./types"; import FormikForm from "@/app/base/components/FormikForm"; import { useWindowTitle } from "@/app/base/hooks"; -import { actions as configActions } from "@/app/store/config"; +import { configActions } from "@/app/store/config"; import configSelectors from "@/app/store/config/selectors"; const StorageSchema = Yup.object().shape({ diff --git a/src/app/settings/views/Users/UserDeleteForm/UserDeleteForm.tsx b/src/app/settings/views/Users/UserDeleteForm/UserDeleteForm.tsx index ca10523844d..b22f6f5f09a 100644 --- a/src/app/settings/views/Users/UserDeleteForm/UserDeleteForm.tsx +++ b/src/app/settings/views/Users/UserDeleteForm/UserDeleteForm.tsx @@ -8,7 +8,7 @@ import FormikForm from "@/app/base/components/FormikForm"; import { useAddMessage } from "@/app/base/hooks"; import type { EmptyObject } from "@/app/base/types"; import settingsURLs from "@/app/settings/urls"; -import { actions as userActions } from "@/app/store/user"; +import { userActions } from "@/app/store/user"; import userSelectors from "@/app/store/user/selectors"; import type { User } from "@/app/store/user/types"; diff --git a/src/app/settings/views/Users/UserEdit/UserEdit.tsx b/src/app/settings/views/Users/UserEdit/UserEdit.tsx index 4ba597bb49c..a6c48f97bb9 100644 --- a/src/app/settings/views/Users/UserEdit/UserEdit.tsx +++ b/src/app/settings/views/Users/UserEdit/UserEdit.tsx @@ -8,7 +8,7 @@ import { useGetURLId } from "@/app/base/hooks/urls"; import { PodMeta } from "@/app/store/pod/types"; import type { RootState } from "@/app/store/root/types"; import statusSelectors from "@/app/store/status/selectors"; -import { actions as userActions } from "@/app/store/user"; +import { userActions } from "@/app/store/user"; import userSelectors from "@/app/store/user/selectors"; export const UserEdit = (): JSX.Element => { diff --git a/src/app/settings/views/Users/UserForm/UserForm.tsx b/src/app/settings/views/Users/UserForm/UserForm.tsx index b667dcc6d2b..97881fa5eb6 100644 --- a/src/app/settings/views/Users/UserForm/UserForm.tsx +++ b/src/app/settings/views/Users/UserForm/UserForm.tsx @@ -7,8 +7,8 @@ import BaseUserForm from "@/app/base/components/UserForm"; import type { Props as UserFormProps } from "@/app/base/components/UserForm/UserForm"; import { useAddMessage } from "@/app/base/hooks"; import settingsURLs from "@/app/settings/urls"; -import { actions as authActions } from "@/app/store/auth"; -import { actions as userActions } from "@/app/store/user"; +import { authActions } from "@/app/store/auth"; +import { userActions } from "@/app/store/user"; import userSelectors from "@/app/store/user/selectors"; import type { User } from "@/app/store/user/types"; diff --git a/src/app/settings/views/Users/UsersList/UsersList.tsx b/src/app/settings/views/Users/UsersList/UsersList.tsx index fdb438e6008..4e4b6c69e33 100644 --- a/src/app/settings/views/Users/UsersList/UsersList.tsx +++ b/src/app/settings/views/Users/UsersList/UsersList.tsx @@ -19,7 +19,7 @@ import settingsURLs from "@/app/settings/urls"; import authSelectors from "@/app/store/auth/selectors"; import type { RootState } from "@/app/store/root/types"; import statusSelectors from "@/app/store/status/selectors"; -import { actions as userActions } from "@/app/store/user"; +import { userActions } from "@/app/store/user"; import userSelectors from "@/app/store/user/selectors"; import type { User } from "@/app/store/user/types"; import { isComparable } from "@/app/utils"; diff --git a/src/app/store/auth/index.ts b/src/app/store/auth/index.ts index 21d7a3d4ccb..6c437c9ef7a 100644 --- a/src/app/store/auth/index.ts +++ b/src/app/store/auth/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as authActions } from "./slice"; diff --git a/src/app/store/auth/slice.ts b/src/app/store/auth/slice.ts index 125a9786597..a8c81303710 100644 --- a/src/app/store/auth/slice.ts +++ b/src/app/store/auth/slice.ts @@ -6,7 +6,7 @@ import type { SliceCaseReducers, } from "@reduxjs/toolkit"; -import { actions as userActions } from "@/app/store/user"; +import { userActions } from "@/app/store/user"; import type { AuthState, User, UserState } from "@/app/store/user/types"; type WithPrepare = { diff --git a/src/app/store/bootresource/index.ts b/src/app/store/bootresource/index.ts index 21d7a3d4ccb..80fcb6656d3 100644 --- a/src/app/store/bootresource/index.ts +++ b/src/app/store/bootresource/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as bootResourceActions } from "./slice"; diff --git a/src/app/store/config/index.ts b/src/app/store/config/index.ts index 21d7a3d4ccb..bc498dc00f8 100644 --- a/src/app/store/config/index.ts +++ b/src/app/store/config/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as configActions } from "./slice"; diff --git a/src/app/store/controller/index.ts b/src/app/store/controller/index.ts index 21d7a3d4ccb..55fc283eaff 100644 --- a/src/app/store/controller/index.ts +++ b/src/app/store/controller/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as controllerActions } from "./slice"; diff --git a/src/app/store/device/index.ts b/src/app/store/device/index.ts index 21d7a3d4ccb..d26d28be9e0 100644 --- a/src/app/store/device/index.ts +++ b/src/app/store/device/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as deviceActions } from "./slice"; diff --git a/src/app/store/dhcpsnippet/index.ts b/src/app/store/dhcpsnippet/index.ts index 21d7a3d4ccb..3aab58b434a 100644 --- a/src/app/store/dhcpsnippet/index.ts +++ b/src/app/store/dhcpsnippet/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as dhcpsnippetActions } from "./slice"; diff --git a/src/app/store/discovery/index.ts b/src/app/store/discovery/index.ts index 21d7a3d4ccb..a2f50e99ff7 100644 --- a/src/app/store/discovery/index.ts +++ b/src/app/store/discovery/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as discoveryActions } from "./slice"; diff --git a/src/app/store/domain/index.ts b/src/app/store/domain/index.ts index 21d7a3d4ccb..7d7c3f7b5f6 100644 --- a/src/app/store/domain/index.ts +++ b/src/app/store/domain/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as domainActions } from "./slice"; diff --git a/src/app/store/event/index.ts b/src/app/store/event/index.ts index 21d7a3d4ccb..0d3e79f8e4f 100644 --- a/src/app/store/event/index.ts +++ b/src/app/store/event/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as eventActions } from "./slice"; diff --git a/src/app/store/fabric/index.ts b/src/app/store/fabric/index.ts index 21d7a3d4ccb..72106c4de22 100644 --- a/src/app/store/fabric/index.ts +++ b/src/app/store/fabric/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as fabricActions } from "./slice"; diff --git a/src/app/store/general/index.ts b/src/app/store/general/index.ts index 21d7a3d4ccb..1427dd28e7b 100644 --- a/src/app/store/general/index.ts +++ b/src/app/store/general/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as generalActions } from "./slice"; diff --git a/src/app/store/iprange/index.ts b/src/app/store/iprange/index.ts index 21d7a3d4ccb..b4749e9134d 100644 --- a/src/app/store/iprange/index.ts +++ b/src/app/store/iprange/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as ipRangeActions } from "./slice"; diff --git a/src/app/store/licensekeys/index.ts b/src/app/store/licensekeys/index.ts index 21d7a3d4ccb..c22bd0791b8 100644 --- a/src/app/store/licensekeys/index.ts +++ b/src/app/store/licensekeys/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as licenseKeysActions } from "./slice"; diff --git a/src/app/store/machine/index.ts b/src/app/store/machine/index.ts index 4caefe078e1..15f4df5a99f 100644 --- a/src/app/store/machine/index.ts +++ b/src/app/store/machine/index.ts @@ -1,2 +1,2 @@ -export { default, actions } from "./slice"; +export { default, actions as machineActions } from "./slice"; export { DEFAULT_STATUSES } from "./constants"; diff --git a/src/app/store/machine/utils/hooks.test.tsx b/src/app/store/machine/utils/hooks.test.tsx index 17d3cb5406e..cf1ce0f32a5 100644 --- a/src/app/store/machine/utils/hooks.test.tsx +++ b/src/app/store/machine/utils/hooks.test.tsx @@ -25,7 +25,7 @@ import { useFetchedCount, } from "./hooks"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { FetchFilters, FetchGroupKey, diff --git a/src/app/store/machine/utils/hooks.tsx b/src/app/store/machine/utils/hooks.tsx index 5f0b0bcd753..369edffde1c 100644 --- a/src/app/store/machine/utils/hooks.tsx +++ b/src/app/store/machine/utils/hooks.tsx @@ -24,12 +24,12 @@ import type { } from "@/app/base/types"; import ErrorDetails from "@/app/machines/components/ErrorDetails"; import type { MachineActionFormProps } from "@/app/machines/types"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { architectures as architecturesSelectors, osInfo as osInfoSelectors, } from "@/app/store/general/selectors"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import machineSelectors from "@/app/store/machine/selectors"; import type { FetchFilters, @@ -38,7 +38,7 @@ import type { MachineStateListGroup, SelectedMachines, } from "@/app/store/machine/types"; -import type { actions as resourcePoolActions } from "@/app/store/resourcepool"; +import type { resourcePoolActions } from "@/app/store/resourcepool"; import type { RootState } from "@/app/store/root/types"; import { NetworkInterfaceTypes } from "@/app/store/types/enum"; import type { Host } from "@/app/store/types/host"; diff --git a/src/app/store/message/index.ts b/src/app/store/message/index.ts index 21d7a3d4ccb..64fbfc342f6 100644 --- a/src/app/store/message/index.ts +++ b/src/app/store/message/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as messageActions } from "./slice"; diff --git a/src/app/store/nodedevice/index.ts b/src/app/store/nodedevice/index.ts index 21d7a3d4ccb..90ebce4d624 100644 --- a/src/app/store/nodedevice/index.ts +++ b/src/app/store/nodedevice/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as nodeDeviceActions } from "./slice"; diff --git a/src/app/store/nodescriptresult/index.ts b/src/app/store/nodescriptresult/index.ts index 21d7a3d4ccb..0d63cd56063 100644 --- a/src/app/store/nodescriptresult/index.ts +++ b/src/app/store/nodescriptresult/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as nodeScriptResultActions } from "./slice"; diff --git a/src/app/store/nodescriptresult/slice.ts b/src/app/store/nodescriptresult/slice.ts index 3a7db1df4b8..a284d920ac5 100644 --- a/src/app/store/nodescriptresult/slice.ts +++ b/src/app/store/nodescriptresult/slice.ts @@ -3,7 +3,7 @@ import type { PayloadAction } from "@reduxjs/toolkit"; import { NodeScriptResultMeta } from "@/app/store/nodescriptresult/types"; import type { NodeScriptResultState } from "@/app/store/nodescriptresult/types"; -import { actions as scriptResultActions } from "@/app/store/scriptresult"; +import { scriptResultActions } from "@/app/store/scriptresult"; import type { ScriptResult } from "@/app/store/scriptresult/types"; import type { GenericItemMeta } from "@/app/store/utils"; diff --git a/src/app/store/notification/index.ts b/src/app/store/notification/index.ts index 21d7a3d4ccb..72f6a6b36cc 100644 --- a/src/app/store/notification/index.ts +++ b/src/app/store/notification/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as notificationActions } from "./slice"; diff --git a/src/app/store/packagerepository/index.ts b/src/app/store/packagerepository/index.ts index 21d7a3d4ccb..a425d61be43 100644 --- a/src/app/store/packagerepository/index.ts +++ b/src/app/store/packagerepository/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as repositoryActions } from "./slice"; diff --git a/src/app/store/pod/index.ts b/src/app/store/pod/index.ts index 21d7a3d4ccb..6ef043b35b8 100644 --- a/src/app/store/pod/index.ts +++ b/src/app/store/pod/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as podActions } from "./slice"; diff --git a/src/app/store/resourcepool/actions.test.ts b/src/app/store/resourcepool/actions.test.ts index 6756bba92a9..8fdd4ca640a 100644 --- a/src/app/store/resourcepool/actions.test.ts +++ b/src/app/store/resourcepool/actions.test.ts @@ -1,10 +1,10 @@ -import { actions } from "./"; +import { resourcePoolActions } from "./"; import * as factory from "@/testing/factories"; -describe("resourcepool actions", () => { +describe("resourcepool resourcePoolActions", () => { it("returns an action for fetching resource pools", () => { - expect(actions.fetch()).toEqual({ + expect(resourcePoolActions.fetch()).toEqual({ type: "resourcepool/fetch", meta: { model: "resourcepool", @@ -15,7 +15,9 @@ describe("resourcepool actions", () => { }); it("returns an action for creating resource pools", () => { - expect(actions.create({ name: "pool1", description: "a pool" })).toEqual({ + expect( + resourcePoolActions.create({ name: "pool1", description: "a pool" }) + ).toEqual({ type: "resourcepool/create", meta: { model: "resourcepool", @@ -32,7 +34,11 @@ describe("resourcepool actions", () => { it("returns an action for updating resource pools", () => { expect( - actions.update({ id: 1, name: "newName", description: "new description" }) + resourcePoolActions.update({ + id: 1, + name: "newName", + description: "new description", + }) ).toEqual({ type: "resourcepool/update", meta: { @@ -50,7 +56,7 @@ describe("resourcepool actions", () => { }); it("returns an action for deleting resource pools", () => { - expect(actions.delete(808)).toEqual({ + expect(resourcePoolActions.delete(808)).toEqual({ type: "resourcepool/delete", meta: { model: "resourcepool", @@ -65,7 +71,7 @@ describe("resourcepool actions", () => { }); it("returns an action for cleaning resource pools", () => { - expect(actions.cleanup()).toEqual({ + expect(resourcePoolActions.cleanup()).toEqual({ type: "resourcepool/cleanup", }); }); @@ -73,7 +79,9 @@ describe("resourcepool actions", () => { it("returns an action for creating resource pools with machines", () => { const pool = factory.resourcePool({ name: "pool1" }); const machineIDs = ["abc123", "def456"]; - expect(actions.createWithMachines({ pool, machineIDs })).toEqual({ + expect( + resourcePoolActions.createWithMachines({ pool, machineIDs }) + ).toEqual({ type: "resourcepool/createWithMachines", payload: { params: { diff --git a/src/app/store/resourcepool/index.ts b/src/app/store/resourcepool/index.ts index 21d7a3d4ccb..4c2f5381c81 100644 --- a/src/app/store/resourcepool/index.ts +++ b/src/app/store/resourcepool/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as resourcePoolActions } from "./slice"; diff --git a/src/app/store/script/index.ts b/src/app/store/script/index.ts index 21d7a3d4ccb..59def024d34 100644 --- a/src/app/store/script/index.ts +++ b/src/app/store/script/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as scriptActions } from "./slice"; diff --git a/src/app/store/scriptresult/index.ts b/src/app/store/scriptresult/index.ts index 21d7a3d4ccb..3b18ced92b0 100644 --- a/src/app/store/scriptresult/index.ts +++ b/src/app/store/scriptresult/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as scriptResultActions } from "./slice"; diff --git a/src/app/store/service/index.ts b/src/app/store/service/index.ts index 21d7a3d4ccb..7ced343c439 100644 --- a/src/app/store/service/index.ts +++ b/src/app/store/service/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as serviceActions } from "./slice"; diff --git a/src/app/store/space/actions.test.ts b/src/app/store/space/actions.test.ts index bb489851c4e..5b7a3fbb1a0 100644 --- a/src/app/store/space/actions.test.ts +++ b/src/app/store/space/actions.test.ts @@ -1,8 +1,8 @@ -import { actions } from "./"; +import { spaceActions } from "./"; describe("space actions", () => { it("returns a fetch action", () => { - expect(actions.fetch()).toEqual({ + expect(spaceActions.fetch()).toEqual({ type: "space/fetch", meta: { model: "space", @@ -13,7 +13,9 @@ describe("space actions", () => { }); it("returns a create action", () => { - expect(actions.create({ name: "space1", description: "a space" })).toEqual({ + expect( + spaceActions.create({ name: "space1", description: "a space" }) + ).toEqual({ type: "space/create", meta: { model: "space", @@ -30,7 +32,7 @@ describe("space actions", () => { it("returns an update action", () => { expect( - actions.update({ id: 1, name: "space1", description: "a space" }) + spaceActions.update({ id: 1, name: "space1", description: "a space" }) ).toEqual({ type: "space/update", meta: { @@ -48,7 +50,7 @@ describe("space actions", () => { }); it("returns a delete action", () => { - expect(actions.delete(1)).toEqual({ + expect(spaceActions.delete(1)).toEqual({ type: "space/delete", meta: { model: "space", @@ -63,14 +65,14 @@ describe("space actions", () => { }); it("returns a cleanup action", () => { - expect(actions.cleanup()).toEqual({ + expect(spaceActions.cleanup()).toEqual({ type: "space/cleanup", payload: undefined, }); }); it("can create an action to get a space", () => { - expect(actions.get(0)).toEqual({ + expect(spaceActions.get(0)).toEqual({ type: "space/get", meta: { model: "space", @@ -83,7 +85,7 @@ describe("space actions", () => { }); it("can create an action to set an active space", () => { - expect(actions.setActive(0)).toEqual({ + expect(spaceActions.setActive(0)).toEqual({ type: "space/setActive", meta: { model: "space", diff --git a/src/app/store/space/index.ts b/src/app/store/space/index.ts index 21d7a3d4ccb..852f6e788c6 100644 --- a/src/app/store/space/index.ts +++ b/src/app/store/space/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as spaceActions } from "./slice"; diff --git a/src/app/store/sshkey/index.ts b/src/app/store/sshkey/index.ts index 21d7a3d4ccb..e5bc50d11ea 100644 --- a/src/app/store/sshkey/index.ts +++ b/src/app/store/sshkey/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as sshkeyActions } from "./slice"; diff --git a/src/app/store/sslkey/index.ts b/src/app/store/sslkey/index.ts index 21d7a3d4ccb..8dbcf838018 100644 --- a/src/app/store/sslkey/index.ts +++ b/src/app/store/sslkey/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as sslkeyActions } from "./slice"; diff --git a/src/app/store/staticroute/index.ts b/src/app/store/staticroute/index.ts index 21d7a3d4ccb..7498ca55c79 100644 --- a/src/app/store/staticroute/index.ts +++ b/src/app/store/staticroute/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as staticRouteActions } from "./slice"; diff --git a/src/app/store/status/index.ts b/src/app/store/status/index.ts index 21d7a3d4ccb..b98dcf8283a 100644 --- a/src/app/store/status/index.ts +++ b/src/app/store/status/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as statusActions } from "./slice"; diff --git a/src/app/store/subnet/hooks.ts b/src/app/store/subnet/hooks.ts index 1d2dabf785b..060c15e30c9 100644 --- a/src/app/store/subnet/hooks.ts +++ b/src/app/store/subnet/hooks.ts @@ -4,10 +4,10 @@ import { getHasIPAddresses } from "./utils"; import { useFetchActions } from "@/app/base/hooks"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet, SubnetMeta } from "@/app/store/subnet/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; /** diff --git a/src/app/store/subnet/index.ts b/src/app/store/subnet/index.ts index 21d7a3d4ccb..e6d290103d9 100644 --- a/src/app/store/subnet/index.ts +++ b/src/app/store/subnet/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as subnetActions } from "./slice"; diff --git a/src/app/store/tag/index.ts b/src/app/store/tag/index.ts index 21d7a3d4ccb..6b34e1fc4c7 100644 --- a/src/app/store/tag/index.ts +++ b/src/app/store/tag/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as tagActions } from "./slice"; diff --git a/src/app/store/token/index.ts b/src/app/store/token/index.ts index 21d7a3d4ccb..77dde7ba7bb 100644 --- a/src/app/store/token/index.ts +++ b/src/app/store/token/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as tokenActions } from "./slice"; diff --git a/src/app/store/user/index.ts b/src/app/store/user/index.ts index 21d7a3d4ccb..45aee1b11a1 100644 --- a/src/app/store/user/index.ts +++ b/src/app/store/user/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as userActions } from "./slice"; diff --git a/src/app/store/vlan/actions.test.ts b/src/app/store/vlan/actions.test.ts index 66eb5b2bfc5..3b5de7bd01d 100644 --- a/src/app/store/vlan/actions.test.ts +++ b/src/app/store/vlan/actions.test.ts @@ -1,8 +1,8 @@ -import { actions } from "./"; +import { vlanActions } from "./"; describe("vlan actions", () => { it("returns an action for fetching vlans", () => { - expect(actions.fetch()).toEqual({ + expect(vlanActions.fetch()).toEqual({ type: "vlan/fetch", meta: { model: "vlan", @@ -14,7 +14,7 @@ describe("vlan actions", () => { it("returns an action for creating vlans", () => { expect( - actions.create({ name: "vlan1", description: "a vlan", vid: 99 }) + vlanActions.create({ name: "vlan1", description: "a vlan", vid: 99 }) ).toEqual({ type: "vlan/create", meta: { @@ -33,7 +33,12 @@ describe("vlan actions", () => { it("returns an action for updating vlans", () => { expect( - actions.update({ id: 1, name: "vlan1", description: "a vlan", vid: 99 }) + vlanActions.update({ + id: 1, + name: "vlan1", + description: "a vlan", + vid: 99, + }) ).toEqual({ type: "vlan/update", meta: { @@ -52,7 +57,7 @@ describe("vlan actions", () => { }); it("returns an action for deleting vlans", () => { - expect(actions.delete(1)).toEqual({ + expect(vlanActions.delete(1)).toEqual({ type: "vlan/delete", meta: { model: "vlan", @@ -67,13 +72,13 @@ describe("vlan actions", () => { }); it("returns an action for cleaning vlans", () => { - expect(actions.cleanup()).toEqual({ + expect(vlanActions.cleanup()).toEqual({ type: "vlan/cleanup", }); }); it("can create an action to get a vlan", () => { - expect(actions.get(0)).toEqual({ + expect(vlanActions.get(0)).toEqual({ type: "vlan/get", meta: { model: "vlan", @@ -86,7 +91,7 @@ describe("vlan actions", () => { }); it("can create an action to set an active vlan", () => { - expect(actions.setActive(0)).toEqual({ + expect(vlanActions.setActive(0)).toEqual({ type: "vlan/setActive", meta: { model: "vlan", @@ -100,7 +105,7 @@ describe("vlan actions", () => { it("can create an action for configuring DHCP", () => { expect( - actions.configureDHCP({ + vlanActions.configureDHCP({ id: 0, controllers: ["abc123"], extra: { diff --git a/src/app/store/vlan/index.ts b/src/app/store/vlan/index.ts index 21d7a3d4ccb..6eafab7ba62 100644 --- a/src/app/store/vlan/index.ts +++ b/src/app/store/vlan/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as vlanActions } from "./slice"; diff --git a/src/app/store/vmcluster/index.ts b/src/app/store/vmcluster/index.ts index 21d7a3d4ccb..85a8957d0c9 100644 --- a/src/app/store/vmcluster/index.ts +++ b/src/app/store/vmcluster/index.ts @@ -1 +1 @@ -export { default, actions } from "./slice"; +export { default, actions as vmClusterActions } from "./slice"; diff --git a/src/app/store/zone/index.ts b/src/app/store/zone/index.ts index 55c2e5f1cf9..f7d2fbd0304 100644 --- a/src/app/store/zone/index.ts +++ b/src/app/store/zone/index.ts @@ -1,6 +1,6 @@ export { default, - actions, + actions as zoneActions, initialGenericActions, initialModelActions, } from "./slice"; diff --git a/src/app/subnets/components/DHCPSnippets/DHCPSnippets.test.tsx b/src/app/subnets/components/DHCPSnippets/DHCPSnippets.test.tsx index c0965ca71f9..c77f8463323 100644 --- a/src/app/subnets/components/DHCPSnippets/DHCPSnippets.test.tsx +++ b/src/app/subnets/components/DHCPSnippets/DHCPSnippets.test.tsx @@ -6,7 +6,7 @@ import DHCPSnippets from "./DHCPSnippets"; import type { Props as DHCPTableProps } from "@/app/base/components/DHCPTable/DHCPTable"; import urls from "@/app/base/urls"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import * as factory from "@/testing/factories"; import { render } from "@/testing/utils"; diff --git a/src/app/subnets/components/DHCPSnippets/DHCPSnippets.tsx b/src/app/subnets/components/DHCPSnippets/DHCPSnippets.tsx index 5bae88a08a6..79a3c3a6f82 100644 --- a/src/app/subnets/components/DHCPSnippets/DHCPSnippets.tsx +++ b/src/app/subnets/components/DHCPSnippets/DHCPSnippets.tsx @@ -2,10 +2,10 @@ import { useSelector } from "react-redux"; import DHCPTable from "@/app/base/components/DHCPTable"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as ipRangeActions } from "@/app/store/iprange"; +import { ipRangeActions } from "@/app/store/iprange"; import ipRangeSelectors from "@/app/store/iprange/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet, SubnetMeta } from "@/app/store/subnet/types"; diff --git a/src/app/subnets/components/ReservedRangeDeleteForm/ReservedRangeDeleteForm.tsx b/src/app/subnets/components/ReservedRangeDeleteForm/ReservedRangeDeleteForm.tsx index abed274f77d..71c10f1b9b7 100644 --- a/src/app/subnets/components/ReservedRangeDeleteForm/ReservedRangeDeleteForm.tsx +++ b/src/app/subnets/components/ReservedRangeDeleteForm/ReservedRangeDeleteForm.tsx @@ -5,7 +5,7 @@ import { useSidePanel, type SetSidePanelContent, } from "@/app/base/side-panel-context"; -import { actions as ipRangeActions } from "@/app/store/iprange"; +import { ipRangeActions } from "@/app/store/iprange"; import ipRangeSelectors from "@/app/store/iprange/selectors"; type Props = { diff --git a/src/app/subnets/components/ReservedRangeForm/ReservedRangeForm.test.tsx b/src/app/subnets/components/ReservedRangeForm/ReservedRangeForm.test.tsx index 1f6247eb313..5ba4d55cddd 100644 --- a/src/app/subnets/components/ReservedRangeForm/ReservedRangeForm.test.tsx +++ b/src/app/subnets/components/ReservedRangeForm/ReservedRangeForm.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import ReservedRangeForm, { Labels } from "./ReservedRangeForm"; -import { actions as ipRangeActions } from "@/app/store/iprange"; +import { ipRangeActions } from "@/app/store/iprange"; import type { IPRange } from "@/app/store/iprange/types"; import { IPRangeType } from "@/app/store/iprange/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/subnets/components/ReservedRangeForm/ReservedRangeForm.tsx b/src/app/subnets/components/ReservedRangeForm/ReservedRangeForm.tsx index a438aa1e83d..54b28b560e2 100644 --- a/src/app/subnets/components/ReservedRangeForm/ReservedRangeForm.tsx +++ b/src/app/subnets/components/ReservedRangeForm/ReservedRangeForm.tsx @@ -10,7 +10,7 @@ import { useSidePanel, type SetSidePanelContent, } from "@/app/base/side-panel-context"; -import { actions as ipRangeActions } from "@/app/store/iprange"; +import { ipRangeActions } from "@/app/store/iprange"; import ipRangeSelectors from "@/app/store/iprange/selectors"; import type { IPRange } from "@/app/store/iprange/types"; import { IPRangeType, IPRangeMeta } from "@/app/store/iprange/types"; diff --git a/src/app/subnets/components/ReservedRanges/ReservedRanges.tsx b/src/app/subnets/components/ReservedRanges/ReservedRanges.tsx index dd084414256..3cb28da1702 100644 --- a/src/app/subnets/components/ReservedRanges/ReservedRanges.tsx +++ b/src/app/subnets/components/ReservedRanges/ReservedRanges.tsx @@ -18,7 +18,7 @@ import docsUrls from "@/app/base/docsUrls"; import { useFetchActions } from "@/app/base/hooks"; import type { SetSidePanelContent } from "@/app/base/side-panel-context"; import { useSidePanel } from "@/app/base/side-panel-context"; -import { actions as ipRangeActions } from "@/app/store/iprange"; +import { ipRangeActions } from "@/app/store/iprange"; import ipRangeSelectors from "@/app/store/iprange/selectors"; import type { IPRange } from "@/app/store/iprange/types"; import { IPRangeType } from "@/app/store/iprange/types"; diff --git a/src/app/subnets/views/FabricDetails/EditFabric/EditFabric.test.tsx b/src/app/subnets/views/FabricDetails/EditFabric/EditFabric.test.tsx index 5bdfac2ff98..6b2f66bc834 100644 --- a/src/app/subnets/views/FabricDetails/EditFabric/EditFabric.test.tsx +++ b/src/app/subnets/views/FabricDetails/EditFabric/EditFabric.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import EditFabric from "./EditFabric"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, within, waitFor } from "@/testing/utils"; diff --git a/src/app/subnets/views/FabricDetails/EditFabric/EditFabric.tsx b/src/app/subnets/views/FabricDetails/EditFabric/EditFabric.tsx index ae93840f21f..cedd33bfc15 100644 --- a/src/app/subnets/views/FabricDetails/EditFabric/EditFabric.tsx +++ b/src/app/subnets/views/FabricDetails/EditFabric/EditFabric.tsx @@ -8,7 +8,7 @@ import FabricController from "../FabricSummary/FabricController"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { Fabric, FabricMeta } from "@/app/store/fabric/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/subnets/views/FabricDetails/FabricDetails.test.tsx b/src/app/subnets/views/FabricDetails/FabricDetails.test.tsx index 49b9e6ecdf1..4239838af72 100644 --- a/src/app/subnets/views/FabricDetails/FabricDetails.test.tsx +++ b/src/app/subnets/views/FabricDetails/FabricDetails.test.tsx @@ -4,9 +4,9 @@ import configureStore from "redux-mock-store"; import FabricDetails from "./FabricDetails"; import urls from "@/app/base/urls"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import * as factory from "@/testing/factories"; import { renderWithBrowserRouter, screen } from "@/testing/utils"; diff --git a/src/app/subnets/views/FabricDetails/FabricDetails.tsx b/src/app/subnets/views/FabricDetails/FabricDetails.tsx index 263a6ab0698..04391167d4a 100644 --- a/src/app/subnets/views/FabricDetails/FabricDetails.tsx +++ b/src/app/subnets/views/FabricDetails/FabricDetails.tsx @@ -13,11 +13,11 @@ import PageContent from "@/app/base/components/PageContent"; import SectionHeader from "@/app/base/components/SectionHeader"; import { useGetURLId, useWindowTitle } from "@/app/base/hooks"; import { useSidePanel } from "@/app/base/side-panel-context"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import { FabricMeta } from "@/app/store/fabric/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import { getSidePanelTitle } from "@/app/store/utils/node/base"; import subnetURLs from "@/app/subnets/urls"; import { isId } from "@/app/utils"; diff --git a/src/app/subnets/views/FabricDetails/FabricDetailsHeader/FabricDeleteForm/FabricDeleteForm.test.tsx b/src/app/subnets/views/FabricDetails/FabricDetailsHeader/FabricDeleteForm/FabricDeleteForm.test.tsx index eb035155967..356a4e2d512 100644 --- a/src/app/subnets/views/FabricDetails/FabricDetailsHeader/FabricDeleteForm/FabricDeleteForm.test.tsx +++ b/src/app/subnets/views/FabricDetails/FabricDetailsHeader/FabricDeleteForm/FabricDeleteForm.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import FabricDeleteForm from "./FabricDeleteForm"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/subnets/views/FabricDetails/FabricDetailsHeader/FabricDeleteForm/FabricDeleteForm.tsx b/src/app/subnets/views/FabricDetails/FabricDetailsHeader/FabricDeleteForm/FabricDeleteForm.tsx index a9755b39518..d3e7202dde1 100644 --- a/src/app/subnets/views/FabricDetails/FabricDetailsHeader/FabricDeleteForm/FabricDeleteForm.tsx +++ b/src/app/subnets/views/FabricDetails/FabricDetailsHeader/FabricDeleteForm/FabricDeleteForm.tsx @@ -6,7 +6,7 @@ import { useDispatch, useSelector } from "react-redux"; import FormikForm from "@/app/base/components/FormikForm"; import type { EmptyObject } from "@/app/base/types"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { Fabric, FabricMeta } from "@/app/store/fabric/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/subnets/views/FabricDetails/FabricSummary/FabricController/FabricControllers.tsx b/src/app/subnets/views/FabricDetails/FabricSummary/FabricController/FabricControllers.tsx index a78f6494c68..cc87638a6db 100644 --- a/src/app/subnets/views/FabricDetails/FabricSummary/FabricController/FabricControllers.tsx +++ b/src/app/subnets/views/FabricDetails/FabricSummary/FabricController/FabricControllers.tsx @@ -5,11 +5,11 @@ import { useDispatch, useSelector } from "react-redux"; import ControllerLink from "@/app/base/components/ControllerLink"; import Definition from "@/app/base/components/Definition"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import type { Fabric, FabricMeta } from "@/app/store/fabric/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; type Props = { diff --git a/src/app/subnets/views/FabricDetails/FabricVLANs/FabricVLANs.tsx b/src/app/subnets/views/FabricDetails/FabricVLANs/FabricVLANs.tsx index 17ae788bee0..75dfac06379 100644 --- a/src/app/subnets/views/FabricDetails/FabricVLANs/FabricVLANs.tsx +++ b/src/app/subnets/views/FabricDetails/FabricVLANs/FabricVLANs.tsx @@ -9,13 +9,13 @@ import VLANLink from "@/app/base/components/VLANLink"; import { useFetchActions } from "@/app/base/hooks"; import type { Fabric } from "@/app/store/fabric/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import spaceSelectors from "@/app/store/space/selectors"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; import { getSubnetsInVLAN } from "@/app/store/subnet/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import type { VLAN } from "@/app/store/vlan/types"; import { diff --git a/src/app/subnets/views/FormActions/components/AddFabric.test.tsx b/src/app/subnets/views/FormActions/components/AddFabric.test.tsx index 83ea19ee17e..81832d89b07 100644 --- a/src/app/subnets/views/FormActions/components/AddFabric.test.tsx +++ b/src/app/subnets/views/FormActions/components/AddFabric.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import AddFabric from "./AddFabric"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/subnets/views/FormActions/components/AddFabric.tsx b/src/app/subnets/views/FormActions/components/AddFabric.tsx index 56e82608276..44b932182b5 100644 --- a/src/app/subnets/views/FormActions/components/AddFabric.tsx +++ b/src/app/subnets/views/FormActions/components/AddFabric.tsx @@ -5,7 +5,7 @@ import type { FormActionProps } from "../FormActions"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; type AddFabricValues = { diff --git a/src/app/subnets/views/FormActions/components/AddSpace.test.tsx b/src/app/subnets/views/FormActions/components/AddSpace.test.tsx index 4875fbb9dc3..4b9c9284e26 100644 --- a/src/app/subnets/views/FormActions/components/AddSpace.test.tsx +++ b/src/app/subnets/views/FormActions/components/AddSpace.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import AddSpace from "./AddSpace"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/subnets/views/FormActions/components/AddSpace.tsx b/src/app/subnets/views/FormActions/components/AddSpace.tsx index 94cb821983c..8b5c4fb6948 100644 --- a/src/app/subnets/views/FormActions/components/AddSpace.tsx +++ b/src/app/subnets/views/FormActions/components/AddSpace.tsx @@ -5,7 +5,7 @@ import type { FormActionProps } from "../FormActions"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import spaceSelectors from "@/app/store/space/selectors"; type AddSpaceValues = { diff --git a/src/app/subnets/views/FormActions/components/AddSubnet.test.tsx b/src/app/subnets/views/FormActions/components/AddSubnet.test.tsx index a7e86d3a841..298b2718f5f 100644 --- a/src/app/subnets/views/FormActions/components/AddSubnet.test.tsx +++ b/src/app/subnets/views/FormActions/components/AddSubnet.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import AddSubnet from "./AddSubnet"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/subnets/views/FormActions/components/AddSubnet.tsx b/src/app/subnets/views/FormActions/components/AddSubnet.tsx index 21e96216f5b..ceeb8c5f088 100644 --- a/src/app/subnets/views/FormActions/components/AddSubnet.tsx +++ b/src/app/subnets/views/FormActions/components/AddSubnet.tsx @@ -9,7 +9,7 @@ import FabricSelect from "@/app/base/components/FabricSelect"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import VLANSelect from "@/app/base/components/VLANSelect"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import { toFormikNumber } from "@/app/utils"; diff --git a/src/app/subnets/views/FormActions/components/AddVlan.test.tsx b/src/app/subnets/views/FormActions/components/AddVlan.test.tsx index b6620f914fb..9e4ed41623a 100644 --- a/src/app/subnets/views/FormActions/components/AddVlan.test.tsx +++ b/src/app/subnets/views/FormActions/components/AddVlan.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import AddVlan from "./AddVlan"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/subnets/views/FormActions/components/AddVlan.tsx b/src/app/subnets/views/FormActions/components/AddVlan.tsx index 07a92b88486..9051892903d 100644 --- a/src/app/subnets/views/FormActions/components/AddVlan.tsx +++ b/src/app/subnets/views/FormActions/components/AddVlan.tsx @@ -10,13 +10,13 @@ import FabricSelect from "@/app/base/components/FabricSelect"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import SpaceSelect from "@/app/base/components/SpaceSelect"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import spaceSelectors from "@/app/store/space/selectors"; import { getSpaceDisplay } from "@/app/store/space/utils"; import { VLANVidRange } from "@/app/store/types/enum"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import { toFormikNumber } from "@/app/utils"; diff --git a/src/app/subnets/views/SpaceDetails/SpaceDetails.test.tsx b/src/app/subnets/views/SpaceDetails/SpaceDetails.test.tsx index 30e5dc03d10..1f57563a186 100644 --- a/src/app/subnets/views/SpaceDetails/SpaceDetails.test.tsx +++ b/src/app/subnets/views/SpaceDetails/SpaceDetails.test.tsx @@ -5,7 +5,7 @@ import SpaceDetails from "./SpaceDetails"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import * as factory from "@/testing/factories"; import { renderWithBrowserRouter, diff --git a/src/app/subnets/views/SpaceDetails/SpaceDetails.tsx b/src/app/subnets/views/SpaceDetails/SpaceDetails.tsx index a02a7b7f308..577879f24c9 100644 --- a/src/app/subnets/views/SpaceDetails/SpaceDetails.tsx +++ b/src/app/subnets/views/SpaceDetails/SpaceDetails.tsx @@ -14,7 +14,7 @@ import SectionHeader from "@/app/base/components/SectionHeader"; import { useGetURLId, useWindowTitle } from "@/app/base/hooks"; import { useSidePanel } from "@/app/base/side-panel-context"; import type { RootState } from "@/app/store/root/types"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import spaceSelectors from "@/app/store/space/selectors"; import { SpaceMeta } from "@/app/store/space/types"; import { getSidePanelTitle } from "@/app/store/utils/node/base"; diff --git a/src/app/subnets/views/SpaceDetails/SpaceDetailsHeader/SpaceDelete/SpaceDelete.tsx b/src/app/subnets/views/SpaceDetails/SpaceDetailsHeader/SpaceDelete/SpaceDelete.tsx index 50052e9d504..7bd199caaf5 100644 --- a/src/app/subnets/views/SpaceDetails/SpaceDetailsHeader/SpaceDelete/SpaceDelete.tsx +++ b/src/app/subnets/views/SpaceDetails/SpaceDetailsHeader/SpaceDelete/SpaceDelete.tsx @@ -3,7 +3,7 @@ import { useDispatch, useSelector } from "react-redux"; import FormikForm from "@/app/base/components/FormikForm"; import type { EmptyObject } from "@/app/base/types"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import spaceSelectors from "@/app/store/space/selectors"; import type { Space } from "@/app/store/space/types"; import { getCanBeDeleted } from "@/app/store/space/utils"; diff --git a/src/app/subnets/views/SpaceDetails/SpaceSubnets/SpaceSubnets.tsx b/src/app/subnets/views/SpaceDetails/SpaceSubnets/SpaceSubnets.tsx index 1616f51607e..b8435fe222b 100644 --- a/src/app/subnets/views/SpaceDetails/SpaceSubnets/SpaceSubnets.tsx +++ b/src/app/subnets/views/SpaceDetails/SpaceSubnets/SpaceSubnets.tsx @@ -10,10 +10,10 @@ import TitledSection from "@/app/base/components/TitledSection"; import VLANLink from "@/app/base/components/VLANLink"; import type { RootState } from "@/app/store/root/types"; import type { Space } from "@/app/store/space/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import type { VLAN } from "@/app/store/vlan/types"; import { getVlanById } from "@/app/store/vlan/utils"; diff --git a/src/app/subnets/views/SpaceDetails/SpaceSummary/SpaceSummaryForm/SpaceSummaryForm.test.tsx b/src/app/subnets/views/SpaceDetails/SpaceSummary/SpaceSummaryForm/SpaceSummaryForm.test.tsx index c3588e22906..8810b1968e0 100644 --- a/src/app/subnets/views/SpaceDetails/SpaceSummary/SpaceSummaryForm/SpaceSummaryForm.test.tsx +++ b/src/app/subnets/views/SpaceDetails/SpaceSummary/SpaceSummaryForm/SpaceSummaryForm.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import SpaceSummaryForm from "./SpaceSummaryForm"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, within, waitFor } from "@/testing/utils"; diff --git a/src/app/subnets/views/SpaceDetails/SpaceSummary/SpaceSummaryForm/SpaceSummaryForm.tsx b/src/app/subnets/views/SpaceDetails/SpaceSummary/SpaceSummaryForm/SpaceSummaryForm.tsx index 452b56a1fac..b51aae0e85d 100644 --- a/src/app/subnets/views/SpaceDetails/SpaceSummary/SpaceSummaryForm/SpaceSummaryForm.tsx +++ b/src/app/subnets/views/SpaceDetails/SpaceSummary/SpaceSummaryForm/SpaceSummaryForm.tsx @@ -4,7 +4,7 @@ import * as Yup from "yup"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import spaceSelectors from "@/app/store/space/selectors"; import type { Space } from "@/app/store/space/types"; diff --git a/src/app/subnets/views/SubnetDetails/StaticRoutes/AddStaticRouteForm/AddStaticRouteForm.test.tsx b/src/app/subnets/views/SubnetDetails/StaticRoutes/AddStaticRouteForm/AddStaticRouteForm.test.tsx index 8113d83c7d7..697ff0822b3 100644 --- a/src/app/subnets/views/SubnetDetails/StaticRoutes/AddStaticRouteForm/AddStaticRouteForm.test.tsx +++ b/src/app/subnets/views/SubnetDetails/StaticRoutes/AddStaticRouteForm/AddStaticRouteForm.test.tsx @@ -7,7 +7,7 @@ import { Labels } from "../StaticRoutes"; import AddStaticRouteForm from "./AddStaticRouteForm"; -import { actions as staticRouteActions } from "@/app/store/staticroute"; +import { staticRouteActions } from "@/app/store/staticroute"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor, within } from "@/testing/utils"; diff --git a/src/app/subnets/views/SubnetDetails/StaticRoutes/AddStaticRouteForm/AddStaticRouteForm.tsx b/src/app/subnets/views/SubnetDetails/StaticRoutes/AddStaticRouteForm/AddStaticRouteForm.tsx index 492225472f8..ce8d42b6aa0 100644 --- a/src/app/subnets/views/SubnetDetails/StaticRoutes/AddStaticRouteForm/AddStaticRouteForm.tsx +++ b/src/app/subnets/views/SubnetDetails/StaticRoutes/AddStaticRouteForm/AddStaticRouteForm.tsx @@ -10,9 +10,9 @@ import SubnetSelect from "@/app/base/components/SubnetSelect"; import { useFetchActions } from "@/app/base/hooks"; import type { SetSidePanelContent } from "@/app/base/side-panel-context"; import type { RootState } from "@/app/store/root/types"; -import { actions as staticRouteActions } from "@/app/store/staticroute"; +import { staticRouteActions } from "@/app/store/staticroute"; import staticRouteSelectors from "@/app/store/staticroute/selectors"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet, SubnetMeta } from "@/app/store/subnet/types"; import { getIsDestinationForSource } from "@/app/store/subnet/utils"; diff --git a/src/app/subnets/views/SubnetDetails/StaticRoutes/DeleteStaticRouteform/DeleteStaticRouteForm.test.tsx b/src/app/subnets/views/SubnetDetails/StaticRoutes/DeleteStaticRouteform/DeleteStaticRouteForm.test.tsx index b8c6cc5ffd0..da6a3234144 100644 --- a/src/app/subnets/views/SubnetDetails/StaticRoutes/DeleteStaticRouteform/DeleteStaticRouteForm.test.tsx +++ b/src/app/subnets/views/SubnetDetails/StaticRoutes/DeleteStaticRouteform/DeleteStaticRouteForm.test.tsx @@ -3,7 +3,7 @@ import configureStore from "redux-mock-store"; import DeleteStaticRouteForm from "./DeleteStaticRouteForm"; import type { RootState } from "@/app/store/root/types"; -import { actions as staticRouteActions } from "@/app/store/staticroute"; +import { staticRouteActions } from "@/app/store/staticroute"; import * as factory from "@/testing/factories"; import { renderWithBrowserRouter, screen, userEvent } from "@/testing/utils"; diff --git a/src/app/subnets/views/SubnetDetails/StaticRoutes/DeleteStaticRouteform/DeleteStaticRouteForm.tsx b/src/app/subnets/views/SubnetDetails/StaticRoutes/DeleteStaticRouteform/DeleteStaticRouteForm.tsx index 123a7a436b7..1c8c4dee25d 100644 --- a/src/app/subnets/views/SubnetDetails/StaticRoutes/DeleteStaticRouteform/DeleteStaticRouteForm.tsx +++ b/src/app/subnets/views/SubnetDetails/StaticRoutes/DeleteStaticRouteform/DeleteStaticRouteForm.tsx @@ -2,7 +2,7 @@ import { useDispatch, useSelector } from "react-redux"; import ModelActionForm from "@/app/base/components/ModelActionForm"; import type { SetSidePanelContent } from "@/app/base/side-panel-context"; -import { actions as staticRouteActions } from "@/app/store/staticroute"; +import { staticRouteActions } from "@/app/store/staticroute"; import staticRouteSelectors from "@/app/store/staticroute/selectors"; import type { Subnet, SubnetMeta } from "@/app/store/subnet/types"; diff --git a/src/app/subnets/views/SubnetDetails/StaticRoutes/EditStaticRouteForm/EditStaticRouteForm.test.tsx b/src/app/subnets/views/SubnetDetails/StaticRoutes/EditStaticRouteForm/EditStaticRouteForm.test.tsx index 96e7eec36f7..ae15a1cdda2 100644 --- a/src/app/subnets/views/SubnetDetails/StaticRoutes/EditStaticRouteForm/EditStaticRouteForm.test.tsx +++ b/src/app/subnets/views/SubnetDetails/StaticRoutes/EditStaticRouteForm/EditStaticRouteForm.test.tsx @@ -7,7 +7,7 @@ import { Labels } from "../StaticRoutes"; import EditStaticRouteForm from "./EditStaticRouteForm"; -import { actions as staticRouteActions } from "@/app/store/staticroute"; +import { staticRouteActions } from "@/app/store/staticroute"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor, within } from "@/testing/utils"; diff --git a/src/app/subnets/views/SubnetDetails/StaticRoutes/EditStaticRouteForm/EditStaticRouteForm.tsx b/src/app/subnets/views/SubnetDetails/StaticRoutes/EditStaticRouteForm/EditStaticRouteForm.tsx index 51a3cf6b553..3cd9c20c2b7 100644 --- a/src/app/subnets/views/SubnetDetails/StaticRoutes/EditStaticRouteForm/EditStaticRouteForm.tsx +++ b/src/app/subnets/views/SubnetDetails/StaticRoutes/EditStaticRouteForm/EditStaticRouteForm.tsx @@ -10,13 +10,13 @@ import SubnetSelect from "@/app/base/components/SubnetSelect"; import { useFetchActions } from "@/app/base/hooks"; import type { SetSidePanelContent } from "@/app/base/side-panel-context"; import type { RootState } from "@/app/store/root/types"; -import { actions as staticRouteActions } from "@/app/store/staticroute"; +import { staticRouteActions } from "@/app/store/staticroute"; import staticRouteSelectors from "@/app/store/staticroute/selectors"; import type { StaticRoute, StaticRouteMeta, } from "@/app/store/staticroute/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import { getIsDestinationForSource } from "@/app/store/subnet/utils"; import { toFormikNumber } from "@/app/utils"; diff --git a/src/app/subnets/views/SubnetDetails/StaticRoutes/StaticRoutes.tsx b/src/app/subnets/views/SubnetDetails/StaticRoutes/StaticRoutes.tsx index 06c1d51b920..d5774cbba43 100644 --- a/src/app/subnets/views/SubnetDetails/StaticRoutes/StaticRoutes.tsx +++ b/src/app/subnets/views/SubnetDetails/StaticRoutes/StaticRoutes.tsx @@ -10,10 +10,10 @@ import { useFetchActions } from "@/app/base/hooks"; import type { SetSidePanelContent } from "@/app/base/side-panel-context"; import { useSidePanel } from "@/app/base/side-panel-context"; import authSelectors from "@/app/store/auth/selectors"; -import { actions as staticRouteActions } from "@/app/store/staticroute"; +import { staticRouteActions } from "@/app/store/staticroute"; import staticRouteSelectors from "@/app/store/staticroute/selectors"; import type { StaticRoute } from "@/app/store/staticroute/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet, SubnetMeta } from "@/app/store/subnet/types"; import { getSubnetDisplay } from "@/app/store/subnet/utils"; diff --git a/src/app/subnets/views/SubnetDetails/SubnetDetails.test.tsx b/src/app/subnets/views/SubnetDetails/SubnetDetails.test.tsx index e120f23dbe8..53e037b0977 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetDetails.test.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetDetails.test.tsx @@ -6,8 +6,8 @@ import configureStore from "redux-mock-store"; import SubnetDetails from "./SubnetDetails"; import urls from "@/app/base/urls"; -import { actions as staticRouteActions } from "@/app/store/staticroute"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { staticRouteActions } from "@/app/store/staticroute"; +import { subnetActions } from "@/app/store/subnet"; import * as factory from "@/testing/factories"; import { render, screen } from "@/testing/utils"; diff --git a/src/app/subnets/views/SubnetDetails/SubnetDetails.tsx b/src/app/subnets/views/SubnetDetails/SubnetDetails.tsx index ef0ab303a8a..47de74085e8 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetDetails.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetDetails.tsx @@ -14,8 +14,8 @@ import SectionHeader from "@/app/base/components/SectionHeader"; import { useGetURLId, useWindowTitle } from "@/app/base/hooks"; import { useSidePanel } from "@/app/base/side-panel-context"; import type { RootState } from "@/app/store/root/types"; -import { actions as staticRouteActions } from "@/app/store/staticroute"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { staticRouteActions } from "@/app/store/staticroute"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import { SubnetMeta } from "@/app/store/subnet/types"; import DHCPSnippets from "@/app/subnets/components/DHCPSnippets"; diff --git a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/DeleteSubnet/DeleteSubnet.test.tsx b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/DeleteSubnet/DeleteSubnet.test.tsx index b299d059982..3863f5a473a 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/DeleteSubnet/DeleteSubnet.test.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/DeleteSubnet/DeleteSubnet.test.tsx @@ -8,8 +8,8 @@ import configureStore from "redux-mock-store"; import DeleteSubnet from "./DeleteSubnet"; import urls from "@/app/base/urls"; -import { actions as subnetActions } from "@/app/store/subnet"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { subnetActions } from "@/app/store/subnet"; +import { vlanActions } from "@/app/store/vlan"; import * as factory from "@/testing/factories"; import { render, screen, within, waitFor, userEvent } from "@/testing/utils"; diff --git a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/DeleteSubnet/DeleteSubnet.tsx b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/DeleteSubnet/DeleteSubnet.tsx index 248ea62bcf9..86c061e996d 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/DeleteSubnet/DeleteSubnet.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/DeleteSubnet/DeleteSubnet.tsx @@ -5,7 +5,7 @@ import FormikForm from "@/app/base/components/FormikForm"; import TitledSection from "@/app/base/components/TitledSection"; import { useFetchActions } from "@/app/base/hooks"; import type { EmptyObject } from "@/app/base/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import { useCanBeDeleted, useIsDHCPEnabled } from "@/app/store/subnet/hooks"; import subnetSelectors from "@/app/store/subnet/selectors"; import subnetURLs from "@/app/subnets/urls"; diff --git a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/EditBootArchitectures/EditBootArchitectures.test.tsx b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/EditBootArchitectures/EditBootArchitectures.test.tsx index a8f76b22584..3576128496a 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/EditBootArchitectures/EditBootArchitectures.test.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/EditBootArchitectures/EditBootArchitectures.test.tsx @@ -6,7 +6,7 @@ import configureStore from "redux-mock-store"; import { Headers } from "./BootArchitecturesTable"; import EditBootArchitectures from "./EditBootArchitectures"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor, within } from "@/testing/utils"; diff --git a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/EditBootArchitectures/EditBootArchitectures.tsx b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/EditBootArchitectures/EditBootArchitectures.tsx index 5cfc008a208..839e0bed515 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/EditBootArchitectures/EditBootArchitectures.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/EditBootArchitectures/EditBootArchitectures.tsx @@ -8,10 +8,10 @@ import BootArchitecturesTable from "./BootArchitecturesTable"; import FormikForm from "@/app/base/components/FormikForm"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as generalActions } from "@/app/store/general"; +import { generalActions } from "@/app/store/general"; import { knownBootArchitectures as knownBootArchitecturesSelectors } from "@/app/store/general/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; import type { SubnetActionProps } from "@/app/subnets/views/SubnetDetails/types"; diff --git a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/MapSubnet/MapSubnet.test.tsx b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/MapSubnet/MapSubnet.test.tsx index 6dc7f281886..4d9c3957a12 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/MapSubnet/MapSubnet.test.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/MapSubnet/MapSubnet.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import MapSubnet from "./MapSubnet"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/MapSubnet/MapSubnet.tsx b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/MapSubnet/MapSubnet.tsx index 2aa2282a6d1..f91331716ed 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/MapSubnet/MapSubnet.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetDetailsHeader/SubnetActionForms/components/MapSubnet/MapSubnet.tsx @@ -9,7 +9,7 @@ import { useCycled } from "@/app/base/hooks"; import type { EmptyObject } from "@/app/base/types"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { SubnetActionProps } from "@/app/subnets/views/SubnetDetails/types"; diff --git a/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummary.tsx b/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummary.tsx index 7599daac7a4..f48d6c7bc61 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummary.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummary.tsx @@ -13,12 +13,12 @@ import EditableSection from "@/app/base/components/EditableSection"; import FabricLink from "@/app/base/components/FabricLink"; import VLANLink from "@/app/base/components/VLANLink"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import type { RootState } from "@/app/store/root/types"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet, SubnetMeta } from "@/app/store/subnet/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; type Props = { diff --git a/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummaryForm/SubnetSummaryForm.test.tsx b/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummaryForm/SubnetSummaryForm.test.tsx index 510291c20df..5c4a37a958b 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummaryForm/SubnetSummaryForm.test.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummaryForm/SubnetSummaryForm.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import SubnetSummaryForm from "./SubnetSummaryForm"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummaryForm/SubnetSummaryForm.tsx b/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummaryForm/SubnetSummaryForm.tsx index be5d735bfee..bc229058538 100644 --- a/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummaryForm/SubnetSummaryForm.tsx +++ b/src/app/subnets/views/SubnetDetails/SubnetSummary/SubnetSummaryForm/SubnetSummaryForm.tsx @@ -6,12 +6,12 @@ import type { SubnetSummaryFormValues } from "./types"; import FormikForm from "@/app/base/components/FormikForm"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet, SubnetMeta } from "@/app/store/subnet/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; const subnetSummaryFormSchema = Yup.object().shape({ diff --git a/src/app/subnets/views/SubnetsList/SubnetsTable/hooks.ts b/src/app/subnets/views/SubnetsList/SubnetsTable/hooks.ts index 16bf3c8dd14..28492a37be7 100644 --- a/src/app/subnets/views/SubnetsList/SubnetsTable/hooks.ts +++ b/src/app/subnets/views/SubnetsList/SubnetsTable/hooks.ts @@ -6,13 +6,13 @@ import { SUBNETS_TABLE_ITEMS_PER_PAGE } from "./constants"; import type { SubnetsTableRow, GroupByKey } from "./types"; import { filterSubnetsBySearchText, getTableData } from "./utils"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; -import { actions as spaceActions } from "@/app/store/space"; +import { spaceActions } from "@/app/store/space"; import spaceSelectors from "@/app/store/space/selectors"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; type UseSubnetsTable = { diff --git a/src/app/subnets/views/VLANDetails/ConfigureDHCP/ConfigureDHCP.test.tsx b/src/app/subnets/views/VLANDetails/ConfigureDHCP/ConfigureDHCP.test.tsx index 690ced3ad91..67f0c62d4dd 100644 --- a/src/app/subnets/views/VLANDetails/ConfigureDHCP/ConfigureDHCP.test.tsx +++ b/src/app/subnets/views/VLANDetails/ConfigureDHCP/ConfigureDHCP.test.tsx @@ -4,7 +4,7 @@ import ConfigureDHCP from "./ConfigureDHCP"; import type { RootState } from "@/app/store/root/types"; import { getSubnetDisplay } from "@/app/store/subnet/utils"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import * as factory from "@/testing/factories"; import { userEvent, diff --git a/src/app/subnets/views/VLANDetails/ConfigureDHCP/ConfigureDHCP.tsx b/src/app/subnets/views/VLANDetails/ConfigureDHCP/ConfigureDHCP.tsx index a119eb92acc..f4b150cdbd0 100644 --- a/src/app/subnets/views/VLANDetails/ConfigureDHCP/ConfigureDHCP.tsx +++ b/src/app/subnets/views/VLANDetails/ConfigureDHCP/ConfigureDHCP.tsx @@ -12,18 +12,18 @@ import FormikForm from "@/app/base/components/FormikForm"; import TitledSection from "@/app/base/components/TitledSection"; import docsUrls from "@/app/base/docsUrls"; import { useFetchActions, useCycled } from "@/app/base/hooks"; -import { actions as controllerActions } from "@/app/store/controller"; +import { controllerActions } from "@/app/store/controller"; import controllerSelectors from "@/app/store/controller/selectors"; import type { Controller, ControllerMeta } from "@/app/store/controller/types"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; -import { actions as ipRangeActions } from "@/app/store/iprange"; +import { ipRangeActions } from "@/app/store/iprange"; import ipRangeSelectors from "@/app/store/iprange/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet, SubnetMeta } from "@/app/store/subnet/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import type { ConfigureDHCPParams, diff --git a/src/app/subnets/views/VLANDetails/ConfigureDHCP/DHCPReservedRanges/DHCPReservedRanges.tsx b/src/app/subnets/views/VLANDetails/ConfigureDHCP/DHCPReservedRanges/DHCPReservedRanges.tsx index c17afca1e66..50592985707 100644 --- a/src/app/subnets/views/VLANDetails/ConfigureDHCP/DHCPReservedRanges/DHCPReservedRanges.tsx +++ b/src/app/subnets/views/VLANDetails/ConfigureDHCP/DHCPReservedRanges/DHCPReservedRanges.tsx @@ -11,12 +11,12 @@ import SubnetLink from "@/app/base/components/SubnetLink"; import SubnetSelect from "@/app/base/components/SubnetSelect"; import TitledSection from "@/app/base/components/TitledSection"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as ipRangeActions } from "@/app/store/iprange"; +import { ipRangeActions } from "@/app/store/iprange"; import ipRangeSelectors from "@/app/store/iprange/selectors"; import type { IPRange } from "@/app/store/iprange/types"; import { getCommentDisplay } from "@/app/store/iprange/utils"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; import type { Subnet } from "@/app/store/subnet/types"; import type { VLAN, VLANMeta } from "@/app/store/vlan/types"; diff --git a/src/app/subnets/views/VLANDetails/DHCPStatus/DHCPStatus.tsx b/src/app/subnets/views/VLANDetails/DHCPStatus/DHCPStatus.tsx index 9c0d629edcc..9a478720ef3 100644 --- a/src/app/subnets/views/VLANDetails/DHCPStatus/DHCPStatus.tsx +++ b/src/app/subnets/views/VLANDetails/DHCPStatus/DHCPStatus.tsx @@ -15,13 +15,13 @@ import TitledSection from "@/app/base/components/TitledSection"; import docsUrls from "@/app/base/docsUrls"; import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { Fabric } from "@/app/store/fabric/types"; import type { RootState } from "@/app/store/root/types"; -import { actions as subnetActions } from "@/app/store/subnet"; +import { subnetActions } from "@/app/store/subnet"; import subnetSelectors from "@/app/store/subnet/selectors"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import type { VLAN, VLANMeta } from "@/app/store/vlan/types"; import { getFullVLANName } from "@/app/store/vlan/utils"; diff --git a/src/app/subnets/views/VLANDetails/EditVLAN/EditVLAN.test.tsx b/src/app/subnets/views/VLANDetails/EditVLAN/EditVLAN.test.tsx index 84d3076322b..6246e59c7dc 100644 --- a/src/app/subnets/views/VLANDetails/EditVLAN/EditVLAN.test.tsx +++ b/src/app/subnets/views/VLANDetails/EditVLAN/EditVLAN.test.tsx @@ -6,7 +6,7 @@ import configureStore from "redux-mock-store"; import EditVLAN from "./EditVLAN"; import type { RootState } from "@/app/store/root/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import type { VLAN } from "@/app/store/vlan/types"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor, within } from "@/testing/utils"; diff --git a/src/app/subnets/views/VLANDetails/EditVLAN/EditVLAN.tsx b/src/app/subnets/views/VLANDetails/EditVLAN/EditVLAN.tsx index 692692454f5..03f58e4f65e 100644 --- a/src/app/subnets/views/VLANDetails/EditVLAN/EditVLAN.tsx +++ b/src/app/subnets/views/VLANDetails/EditVLAN/EditVLAN.tsx @@ -13,7 +13,7 @@ import SpaceSelect from "@/app/base/components/SpaceSelect"; import type { RootState } from "@/app/store/root/types"; import { getSpaceDisplay } from "@/app/store/space/utils"; import { VLANMTURange, VLANVidRange } from "@/app/store/types/enum"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import type { VLAN } from "@/app/store/vlan/types"; import { VLANMeta } from "@/app/store/vlan/types"; diff --git a/src/app/subnets/views/VLANDetails/VLANDeleteForm/VLANDeleteForm.test.tsx b/src/app/subnets/views/VLANDetails/VLANDeleteForm/VLANDeleteForm.test.tsx index e6f599c462e..d2719a7b51e 100644 --- a/src/app/subnets/views/VLANDetails/VLANDeleteForm/VLANDeleteForm.test.tsx +++ b/src/app/subnets/views/VLANDetails/VLANDeleteForm/VLANDeleteForm.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import VLANDeleteForm from "./VLANDeleteForm"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/subnets/views/VLANDetails/VLANDeleteForm/VLANDeleteForm.tsx b/src/app/subnets/views/VLANDetails/VLANDeleteForm/VLANDeleteForm.tsx index a5801dff7e4..5de223f4878 100644 --- a/src/app/subnets/views/VLANDetails/VLANDeleteForm/VLANDeleteForm.tsx +++ b/src/app/subnets/views/VLANDetails/VLANDeleteForm/VLANDeleteForm.tsx @@ -8,7 +8,7 @@ import FormikForm from "@/app/base/components/FormikForm"; import type { EmptyObject } from "@/app/base/types"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import type { VLAN, VLANMeta } from "@/app/store/vlan/types"; import subnetURLs from "@/app/subnets/urls"; diff --git a/src/app/subnets/views/VLANDetails/VLANDetails.test.tsx b/src/app/subnets/views/VLANDetails/VLANDetails.test.tsx index a0f2103814b..91e2c120705 100644 --- a/src/app/subnets/views/VLANDetails/VLANDetails.test.tsx +++ b/src/app/subnets/views/VLANDetails/VLANDetails.test.tsx @@ -6,7 +6,7 @@ import configureStore from "redux-mock-store"; import VLANDetails from "./VLANDetails"; import urls from "@/app/base/urls"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import * as factory from "@/testing/factories"; import { render, screen } from "@/testing/utils"; diff --git a/src/app/subnets/views/VLANDetails/VLANDetails.tsx b/src/app/subnets/views/VLANDetails/VLANDetails.tsx index 3508b2de9df..1c160cb292a 100644 --- a/src/app/subnets/views/VLANDetails/VLANDetails.tsx +++ b/src/app/subnets/views/VLANDetails/VLANDetails.tsx @@ -17,7 +17,7 @@ import { useGetURLId, useWindowTitle } from "@/app/base/hooks"; import { useSidePanel } from "@/app/base/side-panel-context"; import type { RootState } from "@/app/store/root/types"; import subnetSelectors from "@/app/store/subnet/selectors"; -import { actions as vlanActions } from "@/app/store/vlan"; +import { vlanActions } from "@/app/store/vlan"; import vlanSelectors from "@/app/store/vlan/selectors"; import { VLANMeta } from "@/app/store/vlan/types"; import DHCPSnippets from "@/app/subnets/components/DHCPSnippets"; diff --git a/src/app/subnets/views/VLANDetails/VLANDetailsHeader/VLANDetailsHeader.tsx b/src/app/subnets/views/VLANDetails/VLANDetailsHeader/VLANDetailsHeader.tsx index b23ac5cce47..db0850d20a9 100644 --- a/src/app/subnets/views/VLANDetails/VLANDetailsHeader/VLANDetailsHeader.tsx +++ b/src/app/subnets/views/VLANDetails/VLANDetailsHeader/VLANDetailsHeader.tsx @@ -7,7 +7,7 @@ import SectionHeader from "@/app/base/components/SectionHeader"; import { useFetchActions } from "@/app/base/hooks"; import { useSidePanel } from "@/app/base/side-panel-context"; import authSelectors from "@/app/store/auth/selectors"; -import { actions as fabricActions } from "@/app/store/fabric"; +import { fabricActions } from "@/app/store/fabric"; import fabricSelectors from "@/app/store/fabric/selectors"; import type { Fabric } from "@/app/store/fabric/types"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/tags/components/AddTagForm/AddTagForm.test.tsx b/src/app/tags/components/AddTagForm/AddTagForm.test.tsx index de725afb24c..2058b4102aa 100644 --- a/src/app/tags/components/AddTagForm/AddTagForm.test.tsx +++ b/src/app/tags/components/AddTagForm/AddTagForm.test.tsx @@ -7,7 +7,7 @@ import AddTagForm, { Label } from "./AddTagForm"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import { Label as KernelOptionsLabel } from "@/app/tags/components/KernelOptionsField"; import * as factory from "@/testing/factories"; import { mockFormikFormSaved } from "@/testing/mockFormikFormSaved"; diff --git a/src/app/tags/components/AddTagForm/AddTagForm.tsx b/src/app/tags/components/AddTagForm/AddTagForm.tsx index fa81e0e7aa0..91a000648c0 100644 --- a/src/app/tags/components/AddTagForm/AddTagForm.tsx +++ b/src/app/tags/components/AddTagForm/AddTagForm.tsx @@ -9,7 +9,7 @@ import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import type { Props as FormikFormProps } from "@/app/base/components/FormikForm/FormikForm"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import type { CreateParams, Tag } from "@/app/store/tag/types"; import KernelOptionsField from "@/app/tags/components/KernelOptionsField"; diff --git a/src/app/tags/components/KernelOptionsField/KernelOptionsField.test.tsx b/src/app/tags/components/KernelOptionsField/KernelOptionsField.test.tsx index 20cc2f60003..1bde16761e5 100644 --- a/src/app/tags/components/KernelOptionsField/KernelOptionsField.test.tsx +++ b/src/app/tags/components/KernelOptionsField/KernelOptionsField.test.tsx @@ -5,7 +5,7 @@ import configureStore from "redux-mock-store"; import KernelOptionsField, { Label } from "./KernelOptionsField"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import type { FetchFilters } from "@/app/store/machine/types"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; diff --git a/src/app/tags/components/TagDetails/TagDetails.test.tsx b/src/app/tags/components/TagDetails/TagDetails.test.tsx index abd385532d3..1dcf1b23050 100644 --- a/src/app/tags/components/TagDetails/TagDetails.test.tsx +++ b/src/app/tags/components/TagDetails/TagDetails.test.tsx @@ -7,7 +7,7 @@ import TagDetails from "./TagDetails"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import * as factory from "@/testing/factories"; import { render, screen } from "@/testing/utils"; diff --git a/src/app/tags/components/TagDetails/TagDetails.tsx b/src/app/tags/components/TagDetails/TagDetails.tsx index e7ff1b4b6bd..e1588e2747a 100644 --- a/src/app/tags/components/TagDetails/TagDetails.tsx +++ b/src/app/tags/components/TagDetails/TagDetails.tsx @@ -8,7 +8,7 @@ import ModelNotFound from "@/app/base/components/ModelNotFound"; import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import type { Tag, TagMeta } from "@/app/store/tag/types"; import { isId } from "@/app/utils"; diff --git a/src/app/tags/components/TagsHeader/AddTagForm/AddTagForm.test.tsx b/src/app/tags/components/TagsHeader/AddTagForm/AddTagForm.test.tsx index a8a08567282..98ec08b8387 100644 --- a/src/app/tags/components/TagsHeader/AddTagForm/AddTagForm.test.tsx +++ b/src/app/tags/components/TagsHeader/AddTagForm/AddTagForm.test.tsx @@ -8,7 +8,7 @@ import AddTagForm, { Label } from "./AddTagForm"; import * as analyticsHooks from "@/app/base/hooks/analytics"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import { Label as DefinitionLabel } from "@/app/tags/components/DefinitionField"; import { Label as KernelOptionsLabel } from "@/app/tags/components/KernelOptionsField"; import { NewDefinitionMessage } from "@/app/tags/constants"; diff --git a/src/app/tags/components/TagsHeader/AddTagForm/AddTagForm.tsx b/src/app/tags/components/TagsHeader/AddTagForm/AddTagForm.tsx index 783b1c32f79..4f2cb47e59f 100644 --- a/src/app/tags/components/TagsHeader/AddTagForm/AddTagForm.tsx +++ b/src/app/tags/components/TagsHeader/AddTagForm/AddTagForm.tsx @@ -10,9 +10,9 @@ import FormikForm from "@/app/base/components/FormikForm"; import { useSendAnalytics } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import { TAG_NAME_REGEX } from "@/app/base/validation"; -import { actions as messageActions } from "@/app/store/message"; +import { messageActions } from "@/app/store/message"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import type { CreateParams, Tag } from "@/app/store/tag/types"; import DefinitionField from "@/app/tags/components/DefinitionField"; diff --git a/src/app/tags/components/TagsHeader/DeleteTagForm/DeleteTagForm.test.tsx b/src/app/tags/components/TagsHeader/DeleteTagForm/DeleteTagForm.test.tsx index 9cd05dbd402..1a4fe93a7c6 100644 --- a/src/app/tags/components/TagsHeader/DeleteTagForm/DeleteTagForm.test.tsx +++ b/src/app/tags/components/TagsHeader/DeleteTagForm/DeleteTagForm.test.tsx @@ -13,7 +13,7 @@ import * as baseHooks from "@/app/base/hooks/base"; import urls from "@/app/base/urls"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import { NodeStatus } from "@/app/store/types/node"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/tags/components/TagsHeader/DeleteTagForm/DeleteTagForm.tsx b/src/app/tags/components/TagsHeader/DeleteTagForm/DeleteTagForm.tsx index b50eddbc47d..95c632964c9 100644 --- a/src/app/tags/components/TagsHeader/DeleteTagForm/DeleteTagForm.tsx +++ b/src/app/tags/components/TagsHeader/DeleteTagForm/DeleteTagForm.tsx @@ -11,7 +11,7 @@ import { useAddMessage, useScrollToTop } from "@/app/base/hooks"; import type { EmptyObject } from "@/app/base/types"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import type { Tag, TagMeta } from "@/app/store/tag/types"; diff --git a/src/app/tags/views/TagDetails/TagDetails.test.tsx b/src/app/tags/views/TagDetails/TagDetails.test.tsx index 3d8d8adf648..e23eb69607d 100644 --- a/src/app/tags/views/TagDetails/TagDetails.test.tsx +++ b/src/app/tags/views/TagDetails/TagDetails.test.tsx @@ -5,7 +5,7 @@ import TagDetails from "./TagDetails"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import * as factory from "@/testing/factories"; import { screen, renderWithBrowserRouter } from "@/testing/utils"; diff --git a/src/app/tags/views/TagDetails/TagDetails.tsx b/src/app/tags/views/TagDetails/TagDetails.tsx index 546f1ca553e..ca658e24cb5 100644 --- a/src/app/tags/views/TagDetails/TagDetails.tsx +++ b/src/app/tags/views/TagDetails/TagDetails.tsx @@ -6,7 +6,7 @@ import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; import { useGetURLId } from "@/app/base/hooks/urls"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import { TagMeta } from "@/app/store/tag/types"; import BaseTagDetails from "@/app/tags/components/TagDetails"; diff --git a/src/app/tags/views/TagList/TagTable/TagTable.tsx b/src/app/tags/views/TagList/TagTable/TagTable.tsx index 8f5855107a7..a34cb178353 100644 --- a/src/app/tags/views/TagList/TagTable/TagTable.tsx +++ b/src/app/tags/views/TagList/TagTable/TagTable.tsx @@ -18,7 +18,7 @@ import docsUrls from "@/app/base/docsUrls"; import { useFetchActions, useTableSort } from "@/app/base/hooks"; import { SortDirection } from "@/app/base/types"; import urls from "@/app/base/urls"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import { TagSearchFilter } from "@/app/store/tag/selectors"; import type { Tag } from "@/app/store/tag/types"; import { TagMeta } from "@/app/store/tag/types"; diff --git a/src/app/tags/views/TagMachines/TagMachines.test.tsx b/src/app/tags/views/TagMachines/TagMachines.test.tsx index ae36afe0264..1ff5566db72 100644 --- a/src/app/tags/views/TagMachines/TagMachines.test.tsx +++ b/src/app/tags/views/TagMachines/TagMachines.test.tsx @@ -7,11 +7,11 @@ import TagMachines, { Label } from "./TagMachines"; import urls from "@/app/base/urls"; import { columnLabels, MachineColumns } from "@/app/machines/constants"; -import { actions as machineActions } from "@/app/store/machine"; +import { machineActions } from "@/app/store/machine"; import { FetchGroupKey, FetchSortDirection } from "@/app/store/machine/types"; import * as query from "@/app/store/machine/utils/query"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import { NodeStatus, FetchNodeStatus } from "@/app/store/types/node"; import * as factory from "@/testing/factories"; import { render, screen } from "@/testing/utils"; diff --git a/src/app/tags/views/TagMachines/TagMachines.tsx b/src/app/tags/views/TagMachines/TagMachines.tsx index ee89c91c75a..4897bc6b46a 100644 --- a/src/app/tags/views/TagMachines/TagMachines.tsx +++ b/src/app/tags/views/TagMachines/TagMachines.tsx @@ -15,7 +15,7 @@ import { DEFAULTS } from "@/app/machines/views/MachineList/MachineListTable/cons import type { FetchGroupKey, FetchFilters } from "@/app/store/machine/types"; import { useFetchMachines } from "@/app/store/machine/utils/hooks"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import { TagMeta } from "@/app/store/tag/types"; import { FetchNodeStatus } from "@/app/store/types/node"; diff --git a/src/app/tags/views/TagUpdate/TagUpdate.test.tsx b/src/app/tags/views/TagUpdate/TagUpdate.test.tsx index 10a8e2f1e9d..51e8e8d2230 100644 --- a/src/app/tags/views/TagUpdate/TagUpdate.test.tsx +++ b/src/app/tags/views/TagUpdate/TagUpdate.test.tsx @@ -8,7 +8,7 @@ import TagUpdate from "./TagUpdate"; import urls from "@/app/base/urls"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import { Label as KernelOptionsLabel } from "@/app/tags/components/KernelOptionsField"; import { NewDefinitionMessage } from "@/app/tags/constants"; import { Label } from "@/app/tags/views/TagDetails"; diff --git a/src/app/tags/views/TagUpdate/TagUpdate.tsx b/src/app/tags/views/TagUpdate/TagUpdate.tsx index b6996c00ee1..0b112a27ac4 100644 --- a/src/app/tags/views/TagUpdate/TagUpdate.tsx +++ b/src/app/tags/views/TagUpdate/TagUpdate.tsx @@ -6,9 +6,9 @@ import TagUpdateFormFields from "./TagUpdateFormFields"; import FormikForm from "@/app/base/components/FormikForm"; import { useFetchActions } from "@/app/base/hooks"; -import { actions as messageActions } from "@/app/store/message"; +import { messageActions } from "@/app/store/message"; import type { RootState } from "@/app/store/root/types"; -import { actions as tagActions } from "@/app/store/tag"; +import { tagActions } from "@/app/store/tag"; import tagSelectors from "@/app/store/tag/selectors"; import type { Tag, UpdateParams, TagMeta } from "@/app/store/tag/types"; import { NewDefinitionMessage } from "@/app/tags/constants"; diff --git a/src/app/zones/views/ZoneDetails/ZoneDetails.tsx b/src/app/zones/views/ZoneDetails/ZoneDetails.tsx index 000e08df539..b7dc7b31c42 100644 --- a/src/app/zones/views/ZoneDetails/ZoneDetails.tsx +++ b/src/app/zones/views/ZoneDetails/ZoneDetails.tsx @@ -12,7 +12,7 @@ import { useGetURLId } from "@/app/base/hooks/urls"; import urls from "@/app/base/urls"; import authSelectors from "@/app/store/auth/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; import { ZoneMeta } from "@/app/store/zone/types"; import { isId } from "@/app/utils"; diff --git a/src/app/zones/views/ZoneDetails/ZoneDetailsContent/ZoneDetailsContent.tsx b/src/app/zones/views/ZoneDetails/ZoneDetailsContent/ZoneDetailsContent.tsx index 1f38bb6e122..2bb58be6141 100644 --- a/src/app/zones/views/ZoneDetails/ZoneDetailsContent/ZoneDetailsContent.tsx +++ b/src/app/zones/views/ZoneDetails/ZoneDetailsContent/ZoneDetailsContent.tsx @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import Definition from "@/app/base/components/Definition"; import { useFetchActions } from "@/app/base/hooks"; import type { RootState } from "@/app/store/root/types"; -import { actions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; type Props = { @@ -16,7 +16,7 @@ const ZoneDetailsContent = ({ id }: Props): JSX.Element | null => { zoneSelectors.getById(state, id) ); - useFetchActions([actions.fetch]); + useFetchActions([zoneActions.fetch]); if (zone) { return ( diff --git a/src/app/zones/views/ZoneDetails/ZoneDetailsForm/ZoneDetailsForm.test.tsx b/src/app/zones/views/ZoneDetails/ZoneDetailsForm/ZoneDetailsForm.test.tsx index bf0038178cd..757d99cd602 100644 --- a/src/app/zones/views/ZoneDetails/ZoneDetailsForm/ZoneDetailsForm.test.tsx +++ b/src/app/zones/views/ZoneDetails/ZoneDetailsForm/ZoneDetailsForm.test.tsx @@ -6,7 +6,7 @@ import configureStore from "redux-mock-store"; import ZoneDetailsForm from "./ZoneDetailsForm"; import type { RootState } from "@/app/store/root/types"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import * as factory from "@/testing/factories"; import { userEvent, render, screen, waitFor } from "@/testing/utils"; diff --git a/src/app/zones/views/ZoneDetails/ZoneDetailsForm/ZoneDetailsForm.tsx b/src/app/zones/views/ZoneDetails/ZoneDetailsForm/ZoneDetailsForm.tsx index 90ab4fa5538..f052e81e032 100644 --- a/src/app/zones/views/ZoneDetails/ZoneDetailsForm/ZoneDetailsForm.tsx +++ b/src/app/zones/views/ZoneDetails/ZoneDetailsForm/ZoneDetailsForm.tsx @@ -8,7 +8,7 @@ import FormikForm from "@/app/base/components/FormikForm"; import { ACTION_STATUS } from "@/app/base/constants"; import { useFetchActions } from "@/app/base/hooks"; import type { RootState } from "@/app/store/root/types"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import { ZONE_ACTIONS } from "@/app/store/zone/constants"; import zoneSelectors from "@/app/store/zone/selectors"; diff --git a/src/app/zones/views/ZoneDetails/ZoneDetailsHeader/ZoneDetailsHeader.tsx b/src/app/zones/views/ZoneDetails/ZoneDetailsHeader/ZoneDetailsHeader.tsx index 56b4872e973..1b8cf1dec70 100644 --- a/src/app/zones/views/ZoneDetails/ZoneDetailsHeader/ZoneDetailsHeader.tsx +++ b/src/app/zones/views/ZoneDetails/ZoneDetailsHeader/ZoneDetailsHeader.tsx @@ -11,7 +11,7 @@ import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import authSelectors from "@/app/store/auth/selectors"; import type { RootState } from "@/app/store/root/types"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import { ZONE_ACTIONS } from "@/app/store/zone/constants"; import zoneSelectors from "@/app/store/zone/selectors"; diff --git a/src/app/zones/views/ZonesList/ZonesList.tsx b/src/app/zones/views/ZonesList/ZonesList.tsx index d24559e0f96..5ee916f380c 100644 --- a/src/app/zones/views/ZonesList/ZonesList.tsx +++ b/src/app/zones/views/ZonesList/ZonesList.tsx @@ -7,7 +7,7 @@ import ZonesListTable from "./ZonesListTable"; import PageContent from "@/app/base/components/PageContent"; import { useFetchActions, useWindowTitle } from "@/app/base/hooks"; import { useSidePanel } from "@/app/base/side-panel-context"; -import { actions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; import { ZoneActionSidePanelViews } from "@/app/zones/constants"; @@ -17,7 +17,7 @@ const ZonesList = (): JSX.Element => { useWindowTitle("Zones"); - useFetchActions([actions.fetch]); + useFetchActions([zoneActions.fetch]); let content = null; diff --git a/src/app/zones/views/ZonesList/ZonesListForm/ZonesListForm.test.tsx b/src/app/zones/views/ZonesList/ZonesListForm/ZonesListForm.test.tsx index 5bb508c68e4..11382ddbf18 100644 --- a/src/app/zones/views/ZonesList/ZonesListForm/ZonesListForm.test.tsx +++ b/src/app/zones/views/ZonesList/ZonesListForm/ZonesListForm.test.tsx @@ -6,7 +6,7 @@ import configureStore from "redux-mock-store"; import ZonesListForm from "./ZonesListForm"; import type { RootState } from "@/app/store/root/types"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import * as factory from "@/testing/factories"; import { userEvent, render, screen } from "@/testing/utils"; diff --git a/src/app/zones/views/ZonesList/ZonesListForm/ZonesListForm.tsx b/src/app/zones/views/ZonesList/ZonesListForm/ZonesListForm.tsx index 7e84670e9c4..28039170dda 100644 --- a/src/app/zones/views/ZonesList/ZonesListForm/ZonesListForm.tsx +++ b/src/app/zones/views/ZonesList/ZonesListForm/ZonesListForm.tsx @@ -6,7 +6,7 @@ import { useDispatch, useSelector } from "react-redux"; import FormikField from "@/app/base/components/FormikField"; import FormikForm from "@/app/base/components/FormikForm"; import type { RootState } from "@/app/store/root/types"; -import { actions as zoneActions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import { ZONE_ACTIONS } from "@/app/store/zone/constants"; import zoneSelectors from "@/app/store/zone/selectors"; diff --git a/src/app/zones/views/ZonesList/ZonesListHeader/ZonesListHeader.tsx b/src/app/zones/views/ZonesList/ZonesListHeader/ZonesListHeader.tsx index 3ee1df7c4be..5794e9eb551 100644 --- a/src/app/zones/views/ZonesList/ZonesListHeader/ZonesListHeader.tsx +++ b/src/app/zones/views/ZonesList/ZonesListHeader/ZonesListHeader.tsx @@ -7,7 +7,7 @@ import ZonesListTitle from "./ZonesListTitle"; import ModelListSubtitle from "@/app/base/components/ModelListSubtitle"; import { useFetchActions } from "@/app/base/hooks"; import type { SetSidePanelContent } from "@/app/base/side-panel-context"; -import { actions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; import { ZoneActionSidePanelViews } from "@/app/zones/constants"; @@ -19,7 +19,7 @@ const ZonesListHeader = ({ const zonesCount = useSelector(zoneSelectors.count); const zonesLoaded = useSelector(zoneSelectors.loaded); - useFetchActions([actions.fetch]); + useFetchActions([zoneActions.fetch]); return ( diff --git a/src/app/zones/views/ZonesList/ZonesListTable/ZonesListTable.tsx b/src/app/zones/views/ZonesList/ZonesListTable/ZonesListTable.tsx index 26ac6912846..4f5dcb0c56a 100644 --- a/src/app/zones/views/ZonesList/ZonesListTable/ZonesListTable.tsx +++ b/src/app/zones/views/ZonesList/ZonesListTable/ZonesListTable.tsx @@ -6,7 +6,7 @@ import { useFetchActions } from "@/app/base/hooks"; import urls from "@/app/base/urls"; import { FilterDevices } from "@/app/store/device/utils"; import { FilterMachines } from "@/app/store/machine/utils"; -import { actions } from "@/app/store/zone"; +import { zoneActions } from "@/app/store/zone"; import zoneSelectors from "@/app/store/zone/selectors"; export enum TestIds { @@ -16,7 +16,7 @@ export enum TestIds { const ZonesListTable = (): JSX.Element => { const zones = useSelector(zoneSelectors.all); - useFetchActions([actions.fetch]); + useFetchActions([zoneActions.fetch]); const headers = [ { content: "Name", sortKey: "name" }, diff --git a/src/bakery.ts b/src/bakery.ts index c765e22b9b5..7e830ccacae 100644 --- a/src/bakery.ts +++ b/src/bakery.ts @@ -2,7 +2,7 @@ import { Bakery, BakeryStorage } from "@canonical/macaroon-bakery"; import { store } from "./redux-store"; -import { actions as statusActions } from "@/app/store/status"; +import { statusActions } from "@/app/store/status"; // Initialise Macaroon Bakery singleton const visit = (error: { Info: { VisitURL: string } }) => {