refactor: simplify store actions export (#5364)

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";
 

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 {

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,

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<typeof authSelectors.get>;

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 = {

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";

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";

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";

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",

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({

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",

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";

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 = {

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";

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";
 

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";
 

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";
 

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";

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 = {

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 = {

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 {

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";
 

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[] }) => {

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";

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 = {

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({

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";
 

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";

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";
 

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";

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";

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";

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";

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";
 

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";

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";