chore: fixed circular dependency issues within actions, utilities and api.

eslint.config.mjs

@@ -115,4 +115,28 @@ export default defineConfig([
       '@typescript-eslint/no-var-requires': 'off',
     },
   },
+  {
+    files: ['src/**/**/*.{js,jsx,ts,tsx}'],
+    rules: {
+      'no-restricted-imports': [
+        'warn',
+        {
+          paths: [
+            {
+              name: 'src/api',
+              message: 'Import the specific file and not the barrel.',
+            },
+            {
+              name: 'src/utilities',
+              message: 'Import the specific file and not the barrel.',
+            },
+            {
+              name: 'src/actions',
+              message: '"Import the specific file and not the barrel."',
+            },
+          ],
+        },
+      ],
+    },
+  },
 ]);

src/actions/action.tsx

@@ -2,7 +2,7 @@ import { type MessageDescriptor, i18n } from '@lingui/core';
 import { Button } from '@patternfly/react-core';
 import { DropdownItem } from '@patternfly/react-core/deprecated';
 import { type ReactNode } from 'react';
-import { Tooltip } from 'src/components';
+import { Tooltip } from '../components/patternfly-wrappers/tooltip';
 
 type ModalType = ({ addAlert, listQuery, query, setState, state }) => ReactNode;
 

src/actions/ansible-remote-delete.tsx

@@ -1,12 +1,10 @@
 import { msg, t } from '@lingui/core/macro';
-import { AnsibleRemoteAPI } from 'src/api';
-import { DeleteRemoteModal } from 'src/components';
-import {
-  handleHttpError,
-  parsePulpIDFromURL,
-  taskAlert,
-  waitForTaskUrl,
-} from 'src/utilities';
+import { AnsibleRemoteAPI } from '../api/ansible-remote';
+import { DeleteRemoteModal } from '../components/delete-remote-modal';
+import { handleHttpError } from '../utilities/fail-alerts';
+import { parsePulpIDFromURL } from '../utilities/parse-pulp-id';
+import { taskAlert } from '../utilities/task-alert';
+import { waitForTaskUrl } from '../utilities/wait-for-task';
 import { Action } from './action';
 
 export const ansibleRemoteDeleteAction = Action({

src/actions/ansible-remote-download-ca.tsx

@@ -1,5 +1,5 @@
 import { msg } from '@lingui/core/macro';
-import { downloadString } from 'src/utilities';
+import { downloadString } from '../utilities/download-data';
 import { Action } from './action';
 
 export const ansibleRemoteDownloadCAAction = Action({

src/actions/ansible-remote-download-client.tsx

@@ -1,5 +1,5 @@
 import { msg } from '@lingui/core/macro';
-import { downloadString } from 'src/utilities';
+import { downloadString } from '../utilities/download-data';
 import { Action } from './action';
 
 export const ansibleRemoteDownloadClientAction = Action({

src/actions/ansible-remote-download-requirements.tsx

@@ -1,5 +1,5 @@
 import { msg } from '@lingui/core/macro';
-import { downloadString } from 'src/utilities';
+import { downloadString } from '../utilities/download-data';
 import { Action } from './action';
 
 export const ansibleRemoteDownloadRequirementsAction = Action({

src/actions/ansible-repository-collection-version-add.tsx

@@ -5,16 +5,18 @@ import { useState } from 'react';
 import {
   AnsibleRepositoryAPI,
   type AnsibleRepositoryType,
-  CollectionVersionAPI,
-  type CollectionVersionSearch,
-} from 'src/api';
+} from '../api/ansible-repository';
+import { CollectionVersionAPI } from '../api/collection-version';
+import { type CollectionVersionSearch } from '../api/response-types/collection';
 import {
   AlertList,
   type AlertType,
-  DetailList,
   closeAlert,
-} from 'src/components';
-import { handleHttpError, parsePulpIDFromURL, taskAlert } from 'src/utilities';
+} from '../components/alert-list';
+import { DetailList } from '../components/detail-list';
+import { handleHttpError } from '../utilities/fail-alerts';
+import { parsePulpIDFromURL } from '../utilities/parse-pulp-id';
+import { taskAlert } from '../utilities/task-alert';
 import { Action } from './action';
 
 const add = (

src/actions/ansible-repository-collection-version-remove.tsx

@@ -2,9 +2,11 @@ import { msg, t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
 import { Text } from '@patternfly/react-core';
 import { useState } from 'react';
-import { AnsibleRepositoryAPI } from 'src/api';
-import { DeleteModal } from 'src/components';
-import { handleHttpError, parsePulpIDFromURL, taskAlert } from 'src/utilities';
+import { AnsibleRepositoryAPI } from '../api/ansible-repository';
+import { DeleteModal } from '../components/delete-modal';
+import { handleHttpError } from '../utilities/fail-alerts';
+import { parsePulpIDFromURL } from '../utilities/parse-pulp-id';
+import { taskAlert } from '../utilities/task-alert';
 import { Action } from './action';
 
 const remove = (

src/actions/ansible-repository-copy.tsx

@@ -1,7 +1,10 @@
 import { msg, t } from '@lingui/core/macro';
-import { AnsibleDistributionAPI } from 'src/api';
-import { getDistroURL, repositoryDistro } from 'src/utilities';
-import type { Distribution } from 'src/utilities/repository-distro';
+import { AnsibleDistributionAPI } from '../api/ansible-distribution';
+import { getDistroURL } from '../utilities/get-repo-url';
+import {
+  type Distribution,
+  repositoryDistro,
+} from '../utilities/repository-distro';
 import { Action } from './action';
 
 export const ansibleRepositoryCopyAction = Action({

src/actions/ansible-repository-delete.tsx

@@ -1,12 +1,11 @@
 import { msg, t } from '@lingui/core/macro';
-import { AnsibleDistributionAPI, AnsibleRepositoryAPI } from 'src/api';
-import { DeleteRepositoryModal } from 'src/components';
-import {
-  handleHttpError,
-  parsePulpIDFromURL,
-  taskAlert,
-  waitForTaskUrl,
-} from 'src/utilities';
+import { AnsibleDistributionAPI } from '../api/ansible-distribution';
+import { AnsibleRepositoryAPI } from '../api/ansible-repository';
+import { DeleteRepositoryModal } from '../components/delete-repository-modal';
+import { handleHttpError } from '../utilities/fail-alerts';
+import { parsePulpIDFromURL } from '../utilities/parse-pulp-id';
+import { taskAlert } from '../utilities/task-alert';
+import { waitForTaskUrl } from '../utilities/wait-for-task';
 import { Action } from './action';
 
 export const ansibleRepositoryDeleteAction = Action({

src/actions/ansible-repository-sync.tsx

@@ -1,10 +1,12 @@
 import { msg, t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
 import { Link } from 'react-router';
-import { AnsibleRepositoryAPI } from 'src/api';
-import { SyncModal } from 'src/components';
-import { Paths, formatPath } from 'src/paths';
-import { handleHttpError, parsePulpIDFromURL, taskAlert } from 'src/utilities';
+import { AnsibleRepositoryAPI } from '../api/ansible-repository';
+import { SyncModal } from '../components/sync-modal';
+import { Paths, formatPath } from '../paths';
+import { handleHttpError } from '../utilities/fail-alerts';
+import { parsePulpIDFromURL } from '../utilities/parse-pulp-id';
+import { taskAlert } from '../utilities/task-alert';
 import { Action } from './action';
 
 export const ansibleRepositorySyncAction = Action({

src/actions/ansible-repository-version-revert.tsx

@@ -1,9 +1,11 @@
 import { msg, t } from '@lingui/core/macro';
 import { Button, Modal } from '@patternfly/react-core';
 import { useState } from 'react';
-import { AnsibleRepositoryAPI } from 'src/api';
-import { Spinner } from 'src/components';
-import { handleHttpError, parsePulpIDFromURL, taskAlert } from 'src/utilities';
+import { AnsibleRepositoryAPI } from '../api/ansible-repository';
+import { Spinner } from '../components/patternfly-wrappers/l10n';
+import { handleHttpError } from '../utilities/fail-alerts';
+import { parsePulpIDFromURL } from '../utilities/parse-pulp-id';
+import { taskAlert } from '../utilities/task-alert';
 import { Action } from './action';
 
 const RevertModal = ({

src/actions/file-remote-delete.tsx

@@ -1,12 +1,10 @@
 import { msg, t } from '@lingui/core/macro';
-import { FileRemoteAPI } from 'src/api';
-import { DeleteRemoteModal } from 'src/components';
-import {
-  handleHttpError,
-  parsePulpIDFromURL,
-  taskAlert,
-  waitForTaskUrl,
-} from 'src/utilities';
+import { FileRemoteAPI } from '../api/file-remote';
+import { DeleteRemoteModal } from '../components/delete-remote-modal';
+import { handleHttpError } from '../utilities/fail-alerts';
+import { parsePulpIDFromURL } from '../utilities/parse-pulp-id';
+import { taskAlert } from '../utilities/task-alert';
+import { waitForTaskUrl } from '../utilities/wait-for-task';
 import { Action } from './action';
 
 export const fileRemoteDeleteAction = Action({

src/actions/file-repository-delete.tsx

@@ -1,12 +1,11 @@
 import { msg, t } from '@lingui/core/macro';
-import { FileDistributionAPI, FileRepositoryAPI } from 'src/api';
-import { DeleteRepositoryModal } from 'src/components';
-import {
-  handleHttpError,
-  parsePulpIDFromURL,
-  taskAlert,
-  waitForTaskUrl,
-} from 'src/utilities';
+import { FileDistributionAPI } from '../api/file-distribution';
+import { FileRepositoryAPI } from '../api/file-repository';
+import { DeleteRepositoryModal } from '../components/delete-repository-modal';
+import { handleHttpError } from '../utilities/fail-alerts';
+import { parsePulpIDFromURL } from '../utilities/parse-pulp-id';
+import { taskAlert } from '../utilities/task-alert';
+import { waitForTaskUrl } from '../utilities/wait-for-task';
 import { Action } from './action';
 
 export const fileRepositoryDeleteAction = Action({

src/actions/file-repository-sync.tsx

@@ -1,7 +1,9 @@
 import { msg, t } from '@lingui/core/macro';
-import { FileRepositoryAPI } from 'src/api';
-import { SyncModal } from 'src/components';
-import { handleHttpError, parsePulpIDFromURL, taskAlert } from 'src/utilities';
+import { FileRepositoryAPI } from '../api/file-repository';
+import { SyncModal } from '../components/sync-modal';
+import { handleHttpError } from '../utilities/fail-alerts';
+import { parsePulpIDFromURL } from '../utilities/parse-pulp-id';
+import { taskAlert } from '../utilities/task-alert';
 import { Action } from './action';
 
 export const fileRepositorySyncAction = Action({

src/api/base.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { ParamHelper } from 'src/utilities';
+import { ParamHelper } from '../utilities/param-helper';
 
 export class BaseAPI {
   http: { delete; get; interceptors; patch; post; put };

src/api/collection.ts

@@ -1,4 +1,4 @@
-import { repositoryBasePath } from 'src/utilities';
+import { repositoryBasePath } from '../utilities/repository-distro';
 import { PulpAPI } from './pulp';
 import {
   type CollectionUploadType,

src/api/execution-environment-registry.ts

@@ -1,5 +1,5 @@
-import { type RemoteType } from '.';
 import { PulpAPI } from './pulp';
+import { type RemoteType } from './response-types/remote';
 
 // Deletes any hidden fields from the object so that they don't get sent to the API
 function clearSetFieldsFromRequest(data, hidden_fields) {

src/api/sign-collections.ts

@@ -1,4 +1,4 @@
-import { repositoryBasePath } from 'src/utilities';
+import { repositoryBasePath } from '../utilities/repository-distro';
 import { PulpAPI } from './pulp';
 import { type CollectionVersionSearch } from './response-types/collection';
 

src/components/access-tab.tsx

@@ -11,7 +11,6 @@ import { Table, Tbody, Td, Tr } from '@patternfly/react-table';
 import { sortBy } from 'lodash';
 import { Component } from 'react';
 import { Link } from 'react-router';
-import { type GroupType, type RoleType } from 'src/api';
 import {
   DeleteModal,
   EmptyStateNoData,
@@ -29,7 +28,9 @@ import {
   Spinner,
   WizardModal,
 } from 'src/components';
-import { ParamHelper } from 'src/utilities';
+import { type RoleType } from '../api/response-types/role';
+import { type GroupType } from '../api/response-types/user';
+import { ParamHelper } from '../utilities/param-helper';
 
 interface UserType {
   username: string;

src/components/detail-list.tsx

@@ -6,7 +6,6 @@ import {
 } from '@patternfly/react-core';
 import { Table, Tbody } from '@patternfly/react-table';
 import { type ReactNode, useEffect, useState } from 'react';
-import { type ActionType } from 'src/actions';
 import {
   AppliedFilters,
   CompoundFilter,
@@ -20,7 +19,9 @@ import {
   type RenderTableRow,
   SortTable,
 } from 'src/components';
-import { filterIsSet, handleHttpError } from 'src/utilities';
+import { type ActionType } from '../actions/action';
+import { handleHttpError } from '../utilities/fail-alerts';
+import { filterIsSet } from '../utilities/filter-is-set';
 
 interface IProps<T> {
   actionContext: {

src/components/list-page.tsx

@@ -7,7 +7,6 @@ import {
 } from '@patternfly/react-core';
 import { Table, Tbody } from '@patternfly/react-table';
 import { Component, type ReactNode } from 'react';
-import { type ActionType } from 'src/actions';
 import { AppContext, type IAppContextType } from 'src/app-context';
 import {
   AlertList,
@@ -25,13 +24,11 @@ import {
   SortTable,
   closeAlert,
 } from 'src/components';
-import {
-  ParamHelper,
-  type RouteProps,
-  filterIsSet,
-  jsxErrorMessage,
-  withRouter,
-} from 'src/utilities';
+import { type ActionType } from '../actions/action';
+import { jsxErrorMessage } from '../utilities/fail-alerts';
+import { filterIsSet } from '../utilities/filter-is-set';
+import { ParamHelper } from '../utilities/param-helper';
+import { type RouteProps, withRouter } from '../utilities/with-router';
 
 interface IState<T> {
   params: {

src/components/login-link.tsx

@@ -2,7 +2,7 @@ import { t } from '@lingui/core/macro';
 import { Link, useLocation } from 'react-router';
 import { Paths, formatPath } from 'src/paths';
 import { config } from 'src/ui-config';
-import { loginURL } from 'src/utilities';
+import { loginURL } from '../utilities/login-url';
 
 interface IProps {
   button?: boolean;

src/paths.ts

@@ -1,4 +1,4 @@
-import { ParamHelper, type ParamType } from 'src/utilities';
+import { ParamHelper, type ParamType } from './utilities/param-helper';
 
 export function formatPath(
   path: string,

src/utilities/content-summary.ts

@@ -1,4 +1,4 @@
-import { type CollectionVersionSearch } from 'src/api';
+import { type CollectionVersionSearch } from '../api/response-types/collection';
 
 class Summary {
   total_count: number;

src/utilities/delete-collection.ts

@@ -1,9 +1,7 @@
 import { t } from '@lingui/core/macro';
-import {
-  CollectionAPI,
-  CollectionVersionAPI,
-  type CollectionVersionSearch,
-} from 'src/api';
+import { CollectionAPI } from '../api/collection';
+import { CollectionVersionAPI } from '../api/collection-version';
+import { type CollectionVersionSearch } from '../api/response-types/collection';
 import { jsxErrorMessage } from './fail-alerts';
 import { parsePulpIDFromURL } from './parse-pulp-id';
 import { repositoryRemoveCollection } from './repository-remove-collection';

src/utilities/fail-alerts.tsx

@@ -1,5 +1,5 @@
 import { t } from '@lingui/core/macro';
-import { LoginLink } from 'src/components';
+import { LoginLink } from '../components/login-link';
 import { mapErrorMessages } from './map-error-messages';
 
 export function errorMessage(

src/utilities/get-repo-url.ts

@@ -1,6 +1,6 @@
 import { config } from 'src/ui-config';
-import { parsePulpResource } from 'src/utilities';
-import { ModelToApi } from 'src/utilities';
+import { ModelToApi } from './model-to-api';
+import { parsePulpResource } from './parse-pulp-id';
 
 export function getDistroURL(distribution) {
   const resource = parsePulpResource(

src/utilities/last-sync-task.tsx

@@ -1,4 +1,6 @@
-import { DateComponent, HelpButton, StatusIndicator } from 'src/components';
+import { DateComponent } from '../components/date-component';
+import { HelpButton } from '../components/help-button';
+import { StatusIndicator } from '../components/status-indicator';
 
 export function lastSynced(entity) {
   if (!entity.last_sync_task || !entity.last_sync_task.finished_at) {

src/utilities/model-to-api.ts

@@ -1,10 +1,10 @@
+import { AnsibleDistributionAPI } from '../api/ansible-distribution';
+import { AnsibleRemoteAPI } from '../api/ansible-remote';
+import { AnsibleRepositoryAPI } from '../api/ansible-repository';
 import {
-  AnsibleDistributionAPI,
-  AnsibleRemoteAPI,
-  AnsibleRepositoryAPI,
   ContainerDistributionAPI,
   ContainerPullThroughDistributionAPI,
-} from 'src/api';
+} from '../api/container-distribution';
 
 export const ModelToApi = {
   // TODO: Add all model translations