fix testing

Signed-off-by: James Talton <[email protected]>
ansible · Aug 29, 2024 · 7c716c2 · 7c716c2
1 parent 86b2a8e
commit 7c716c2
Show file tree

Hide file tree

Showing 21 changed files with 45 additions and 45 deletions.
diff --git a/.github/workflows/component.yml b/.github/workflows/component.yml
@@ -4,7 +4,7 @@ on:
   workflow_call:
 
 jobs:
-  test-matrix:
+  generate-matrix:
     name: Test Matrix
     runs-on: ubuntu-latest
     outputs:
@@ -23,11 +23,11 @@ jobs:
   component:
     name: Component
     runs-on: ubuntu-latest
-    needs: test-matrix
+    needs: generate-matrix
     strategy:
       fail-fast: false
       matrix:
-        directory: ${{ fromJson(needs.test-matrix.outputs.MATRIX) }}
+        directory: ${{ fromJson(needs.generate-matrix.outputs.MATRIX) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/frontend/awx/access/organizations/OrganizationForm.tsx b/frontend/awx/access/organizations/OrganizationForm.tsx
@@ -11,15 +11,15 @@ import {
 import { PageFormTextInput } from '../../../../framework/PageForm/Inputs/PageFormTextInput';
 import { requestGet, requestPatch, swrOptions } from '../../../common/crud/Data';
 import { usePostRequest } from '../../../common/crud/usePostRequest';
-import { useInvalidateCacheOnUnmount } from '../../../common/useInvalidateCache';
+import { useInvalidateCacheOnUnmount } from '../../../common/useInvalidateCache/useInvalidateCache';
 import { PageFormSelectExecutionEnvironment } from '../../administration/execution-environments/components/PageFormSelectExecutionEnvironment';
 import { PageFormInstanceGroupSelect } from '../../administration/instance-groups/components/PageFormInstanceGroupSelect';
 import { AwxPageForm } from '../../common/AwxPageForm';
 import { awxAPI } from '../../common/api/awx-utils';
+import { getAddedAndRemoved } from '../../common/util/getAddedAndRemoved';
 import { InstanceGroup } from '../../interfaces/InstanceGroup';
 import { Organization } from '../../interfaces/Organization';
 import { AwxRoute } from '../../main/AwxRoutes';
-import { getAddedAndRemoved } from '../../common/util/getAddedAndRemoved';
 
 type IOrganizationData = Organization & {
   instanceGroups?: InstanceGroup[];

diff --git a/frontend/awx/access/roles/RoleForm.tsx b/frontend/awx/access/roles/RoleForm.tsx
@@ -1,3 +1,4 @@
+import { useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useParams } from 'react-router-dom';
 import {
@@ -9,18 +10,17 @@ import {
   useGetPageUrl,
   usePageNavigate,
 } from '../../../../framework';
+import { PageFormMultiSelect } from '../../../../framework/PageForm/Inputs/PageFormMultiSelect';
+import { PageFormHidden } from '../../../../framework/PageForm/Utils/PageFormHidden';
 import { useGet } from '../../../common/crud/useGet';
 import { usePatchRequest } from '../../../common/crud/usePatchRequest';
 import { usePostRequest } from '../../../common/crud/usePostRequest';
-import { useInvalidateCacheOnUnmount } from '../../../common/useInvalidateCache';
+import { useInvalidateCacheOnUnmount } from '../../../common/useInvalidateCache/useInvalidateCache';
 import { AwxPageForm } from '../../common/AwxPageForm';
 import { awxAPI } from '../../common/api/awx-utils';
 import { AwxRbacRole } from '../../interfaces/AwxRbacRole';
 import { AwxRoute } from '../../main/AwxRoutes';
 import { AwxContentTypes, useAwxRoleMetadata } from './hooks/useAwxRoleMetadata';
-import { PageFormMultiSelect } from '../../../../framework/PageForm/Inputs/PageFormMultiSelect';
-import { PageFormHidden } from '../../../../framework/PageForm/Utils/PageFormHidden';
-import { useWatch } from 'react-hook-form';
 
 export function CreateRole(props: { breadcrumbLabelForPreviousPage?: string }) {
   const { t } = useTranslation();

diff --git a/frontend/awx/main/AwxLogin.tsx b/frontend/awx/main/AwxLogin.tsx
@@ -1,7 +1,7 @@
 import { Page } from '@patternfly/react-core';
 import useSWR, { mutate } from 'swr';
 import { LoadingState } from '../../../framework/components/LoadingState';
-import { AnsibleLogin } from '../../common/AnsibleLogin';
+import { AnsibleLogin } from '../../common/AnsibleLogin/AnsibleLogin';
 import type { AuthOption } from '../../common/SocialAuthLogin';
 import { requestGet } from '../../common/crud/Data';
 import { awxAPI } from '../common/api/awx-utils';

diff --git a/frontend/common/AnsibleLogin.cy.tsx → ...d/common/AnsibleLogin/AnsibleLogin.cy.tsx b/frontend/common/AnsibleLogin.cy.tsx → ...d/common/AnsibleLogin/AnsibleLogin.cy.tsx
diff --git a/frontend/common/AnsibleLogin.tsx → ...tend/common/AnsibleLogin/AnsibleLogin.tsx b/frontend/common/AnsibleLogin.tsx → ...tend/common/AnsibleLogin/AnsibleLogin.tsx
@@ -10,15 +10,15 @@ import {
   LoginMainHeader,
 } from '@patternfly/react-core';
 import { ExclamationCircleIcon } from '@patternfly/react-icons';
-import { ReactNode, useCallback, useState, useEffect } from 'react';
-import { useLocation } from 'react-router';
+import { ReactNode, useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useLocation } from 'react-router';
 import styled from 'styled-components';
-import { ErrorBoundary } from '../../framework/components/ErrorBoundary';
-import { useFrameworkTranslations } from '../../framework/useFrameworkTranslations';
-import { AuthOption, SocialAuthLogin } from './SocialAuthLogin';
-import { RequestError, createRequestError } from './crud/RequestError';
-import { getCookie } from './crud/cookie';
+import { useFrameworkTranslations } from '../../../framework';
+import { ErrorBoundary } from '../../../framework/components/ErrorBoundary';
+import { getCookie } from '../crud/cookie';
+import { createRequestError, RequestError } from '../crud/RequestError';
+import { AuthOption, SocialAuthLogin } from '../SocialAuthLogin';
 
 export function AnsibleLogin(props: {
   /** Title for the login main body header of the login page */

diff --git a/frontend/common/crud/useDeleteRequest.tsx b/frontend/common/crud/useDeleteRequest.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react';
-import { useClearCache } from '../useInvalidateCache';
+import { useClearCache } from '../useInvalidateCache/useInvalidateCache';
 import { createRequestError } from './RequestError';
 import { requestCommon } from './requestCommon';
 

diff --git a/frontend/common/crud/usePatchRequest.tsx b/frontend/common/crud/usePatchRequest.tsx
@@ -1,4 +1,4 @@
-import { useClearCache } from '../useInvalidateCache';
+import { useClearCache } from '../useInvalidateCache/useInvalidateCache';
 import { createRequestError } from './RequestError';
 import { requestCommon } from './requestCommon';
 

diff --git a/frontend/common/crud/usePostRequest.tsx b/frontend/common/crud/usePostRequest.tsx
@@ -1,4 +1,4 @@
-import { useClearCache } from '../useInvalidateCache';
+import { useClearCache } from '../useInvalidateCache/useInvalidateCache';
 import { createRequestError } from './RequestError';
 import { requestCommon } from './requestCommon';
 

diff --git a/frontend/common/crud/usePutRequest.tsx b/frontend/common/crud/usePutRequest.tsx
@@ -1,4 +1,4 @@
-import { useClearCache } from '../useInvalidateCache';
+import { useClearCache } from '../useInvalidateCache/useInvalidateCache';
 import { createRequestError } from './RequestError';
 import { requestCommon } from './requestCommon';
 

diff --git a/frontend/common/useInvalidateCache.cy.tsx → ...InvalidateCache/useInvalidateCache.cy.tsx b/frontend/common/useInvalidateCache.cy.tsx → ...InvalidateCache/useInvalidateCache.cy.tsx
diff --git a/frontend/common/useInvalidateCache.tsx → ...useInvalidateCache/useInvalidateCache.tsx b/frontend/common/useInvalidateCache.tsx → ...useInvalidateCache/useInvalidateCache.tsx
diff --git a/frontend/eda/access/organizations/OrganizationPage/OrganizationForm.tsx b/frontend/eda/access/organizations/OrganizationPage/OrganizationForm.tsx
@@ -11,11 +11,11 @@ import {
 import { PageFormTextInput } from '../../../../../framework/PageForm/Inputs/PageFormTextInput';
 import { requestGet, requestPatch, swrOptions } from '../../../../common/crud/Data';
 import { usePostRequest } from '../../../../common/crud/usePostRequest';
-import { useInvalidateCacheOnUnmount } from '../../../../common/useInvalidateCache';
+import { useInvalidateCacheOnUnmount } from '../../../../common/useInvalidateCache/useInvalidateCache';
+import { edaAPI } from '../../../common/eda-utils';
 import { EdaPageForm } from '../../../common/EdaPageForm';
 import { EdaOrganization, EdaOrganizationCreate } from '../../../interfaces/EdaOrganization';
 import { EdaRoute } from '../../../main/EdaRoutes';
-import { edaAPI } from '../../../common/eda-utils';
 
 export function CreateOrganization() {
   const { t } = useTranslation();

diff --git a/frontend/eda/access/roles/RoleForm.tsx b/frontend/eda/access/roles/RoleForm.tsx
@@ -1,3 +1,4 @@
+import { useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useParams } from 'react-router-dom';
 import {
@@ -9,18 +10,17 @@ import {
   useGetPageUrl,
   usePageNavigate,
 } from '../../../../framework';
+import { PageFormMultiSelect } from '../../../../framework/PageForm/Inputs/PageFormMultiSelect';
+import { PageFormHidden } from '../../../../framework/PageForm/Utils/PageFormHidden';
 import { useGet } from '../../../common/crud/useGet';
 import { usePatchRequest } from '../../../common/crud/usePatchRequest';
 import { usePostRequest } from '../../../common/crud/usePostRequest';
-import { useInvalidateCacheOnUnmount } from '../../../common/useInvalidateCache';
+import { useInvalidateCacheOnUnmount } from '../../../common/useInvalidateCache/useInvalidateCache';
 import { EdaPageForm } from '../../common/EdaPageForm';
 import { edaAPI } from '../../common/eda-utils';
 import { EdaRbacRole } from '../../interfaces/EdaRbacRole';
 import { EdaRoute } from '../../main/EdaRoutes';
 import { EdaContentTypes, useEdaRoleMetadata } from './hooks/useEdaRoleMetadata';
-import { PageFormMultiSelect } from '../../../../framework/PageForm/Inputs/PageFormMultiSelect';
-import { PageFormHidden } from '../../../../framework/PageForm/Utils/PageFormHidden';
-import { useWatch } from 'react-hook-form';
 
 export function CreateRole(props: { breadcrumbLabelForPreviousPage?: string }) {
   const { t } = useTranslation();

diff --git a/frontend/eda/access/teams/TeamPage/TeamForm.tsx b/frontend/eda/access/teams/TeamPage/TeamForm.tsx
@@ -11,13 +11,13 @@ import {
 import { PageFormTextInput } from '../../../../../framework/PageForm/Inputs/PageFormTextInput';
 import { requestGet, requestPatch, swrOptions } from '../../../../common/crud/Data';
 import { usePostRequest } from '../../../../common/crud/usePostRequest';
-import { useInvalidateCacheOnUnmount } from '../../../../common/useInvalidateCache';
+import { useInvalidateCacheOnUnmount } from '../../../../common/useInvalidateCache/useInvalidateCache';
+import { edaAPI } from '../../../common/eda-utils';
 import { EdaPageForm } from '../../../common/EdaPageForm';
+import { EdaOrganization } from '../../../interfaces/EdaOrganization';
+import { EdaResult } from '../../../interfaces/EdaResult';
 import { EdaTeam, EdaTeamCreate, EdaTeamDetail } from '../../../interfaces/EdaTeam';
 import { EdaRoute } from '../../../main/EdaRoutes';
-import { edaAPI } from '../../../common/eda-utils';
-import { EdaResult } from '../../../interfaces/EdaResult';
-import { EdaOrganization } from '../../../interfaces/EdaOrganization';
 import { PageFormSelectOrganization } from '../../organizations/components/PageFormOrganizationSelect';
 
 export function CreateTeam() {

diff --git a/frontend/eda/main/EdaLogin.tsx b/frontend/eda/main/EdaLogin.tsx
@@ -1,7 +1,7 @@
 import { Page } from '@patternfly/react-core';
 import { mutate } from 'swr';
 import { LoadingState } from '../../../framework/components/LoadingState';
-import { AnsibleLogin } from '../../common/AnsibleLogin';
+import { AnsibleLogin } from '../../common/AnsibleLogin/AnsibleLogin';
 import { edaAPI } from '../common/eda-utils';
 import { useEdaActiveUser } from '../common/useEdaActiveUser';
 

diff --git a/frontend/hub/access/roles/RolePage/HubRoleForm.tsx b/frontend/hub/access/roles/RolePage/HubRoleForm.tsx
@@ -1,6 +1,6 @@
+import { useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useParams } from 'react-router-dom';
-import { useWatch } from 'react-hook-form';
 import {
   PageFormSelect,
   PageFormSubmitHandler,
@@ -10,18 +10,18 @@ import {
   useGetPageUrl,
   usePageNavigate,
 } from '../../../../../framework';
-import { useInvalidateCacheOnUnmount } from '../../../../common/useInvalidateCache';
+import { PageFormMultiSelect } from '../../../../../framework/PageForm/Inputs/PageFormMultiSelect';
+import { PageFormHidden } from '../../../../../framework/PageForm/Utils/PageFormHidden';
+import { useGet } from '../../../../common/crud/useGet';
+import { usePatchRequest } from '../../../../common/crud/usePatchRequest';
 import { usePostRequest } from '../../../../common/crud/usePostRequest';
-import { HubRbacRole } from '../../../interfaces/expanded/HubRbacRole';
+import { useInvalidateCacheOnUnmount } from '../../../../common/useInvalidateCache/useInvalidateCache';
 import { hubAPI } from '../../../common/api/formatPath';
-import { HubRoute } from '../../../main/HubRoutes';
 import { HubPageForm } from '../../../common/HubPageForm';
-import { useHubRoleMetadata } from '../hooks/useHubRoleMetadata';
-import { PageFormHidden } from '../../../../../framework/PageForm/Utils/PageFormHidden';
-import { PageFormMultiSelect } from '../../../../../framework/PageForm/Inputs/PageFormMultiSelect';
 import { ContentTypeEnum } from '../../../interfaces/expanded/ContentType';
-import { useGet } from '../../../../common/crud/useGet';
-import { usePatchRequest } from '../../../../common/crud/usePatchRequest';
+import { HubRbacRole } from '../../../interfaces/expanded/HubRbacRole';
+import { HubRoute } from '../../../main/HubRoutes';
+import { useHubRoleMetadata } from '../hooks/useHubRoleMetadata';
 import { useIsValidRoleName } from '../hooks/useIsValidRoleName';
 
 export function CreateRole(props: { breadcrumbLabelForPreviousPage?: string }) {

diff --git a/frontend/hub/administration/remote-registries/RemoteRegistryForm.tsx b/frontend/hub/administration/remote-registries/RemoteRegistryForm.tsx
@@ -18,7 +18,7 @@ import { PageFormSecret } from '../../../../framework/PageForm/Inputs/PageFormSe
 import { PageFormExpandableSection } from '../../../../framework/PageForm/PageFormExpandableSection';
 import { useGet } from '../../../common/crud/useGet';
 import { usePostRequest } from '../../../common/crud/usePostRequest';
-import { useClearCache } from '../../../common/useInvalidateCache';
+import { useClearCache } from '../../../common/useInvalidateCache/useInvalidateCache';
 import { useIsValidUrl } from '../../../common/validation/useIsValidUrl';
 import { HubError } from '../../common/HubError';
 import { HubPageForm } from '../../common/HubPageForm';

diff --git a/frontend/hub/administration/remotes/RemoteForm.tsx b/frontend/hub/administration/remotes/RemoteForm.tsx
@@ -21,7 +21,7 @@ import { PageFormSection } from '../../../../framework/PageForm/Utils/PageFormSe
 import { LoadingPage } from '../../../../framework/components/LoadingPage';
 import { useGet } from '../../../common/crud/useGet';
 import { usePostRequest } from '../../../common/crud/usePostRequest';
-import { useClearCache } from '../../../common/useInvalidateCache';
+import { useClearCache } from '../../../common/useInvalidateCache/useInvalidateCache';
 import { useIsValidUrl } from '../../../common/validation/useIsValidUrl';
 import { HubError } from '../../common/HubError';
 import { HubPageForm } from '../../common/HubPageForm';

diff --git a/frontend/hub/main/HubLogin.tsx b/frontend/hub/main/HubLogin.tsx
@@ -1,7 +1,7 @@
 import { Page } from '@patternfly/react-core';
 import { mutate } from 'swr';
 import { LoadingState } from '../../../framework/components/LoadingState';
-import { AnsibleLogin } from '../../common/AnsibleLogin';
+import { AnsibleLogin } from '../../common/AnsibleLogin/AnsibleLogin';
 import { useHubActiveUser } from '../../hub/common/useHubActiveUser';
 import { hubAPI } from '../common/api/formatPath';
 import { HubContextProvider } from '../common/useHubContext';

diff --git a/frontend/hub/namespaces/HubNamespaceForm.tsx b/frontend/hub/namespaces/HubNamespaceForm.tsx
@@ -14,7 +14,7 @@ import { PageFormSection } from '../../../framework/PageForm/Utils/PageFormSecti
 import { useGet } from '../../common/crud/useGet';
 import { usePostRequest } from '../../common/crud/usePostRequest';
 import { usePutRequest } from '../../common/crud/usePutRequest';
-import { useClearCache } from '../../common/useInvalidateCache';
+import { useClearCache } from '../../common/useInvalidateCache/useInvalidateCache';
 import { HubError } from '../common/HubError';
 import { HubPageForm } from '../common/HubPageForm';
 import { hubAPI } from '../common/api/formatPath';