diff --git a/frontend/packages/console-app/src/actions/hooks/useBuildsActions.ts b/frontend/packages/console-app/src/actions/hooks/useBuildsActions.ts index a77050d6706..d07edac5f18 100644 --- a/frontend/packages/console-app/src/actions/hooks/useBuildsActions.ts +++ b/frontend/packages/console-app/src/actions/hooks/useBuildsActions.ts @@ -110,7 +110,9 @@ export const useBuildsActions = ( accessReview: asAccessReview(kindObj, obj, 'patch'), }), }), - [t, kindObj, obj, launchModal, cancelBuildModal], + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + [t, kindObj, obj, cancelBuildModal], ); const buildPhase = obj.status?.phase; diff --git a/frontend/packages/console-app/src/actions/hooks/useCommonActions.ts b/frontend/packages/console-app/src/actions/hooks/useCommonActions.ts index 20e9302b249..2ec1f787a3c 100644 --- a/frontend/packages/console-app/src/actions/hooks/useCommonActions.ts +++ b/frontend/packages/console-app/src/actions/hooks/useCommonActions.ts @@ -1,10 +1,11 @@ import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Action } from '@console/dynamic-plugin-sdk'; +import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay'; import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize'; import { annotationsModalLauncher, - deleteModal, + LazyDeleteModalProvider, labelsModalLauncher, podSelectorModal, taintsModal, @@ -43,6 +44,7 @@ export const useCommonActions = ( editPath?: string, ): [ActionObject, boolean] => { const { t } = useTranslation(); + const launchModal = useOverlay(); const launchCountModal = useConfigureCountModal({ resourceKind: kind, resource, @@ -75,7 +77,7 @@ export const useCommonActions = ( id: 'delete-resource', label: t('console-app~Delete {{kind}}', { kind: kind?.kind }), cta: () => - deleteModal({ + launchModal(LazyDeleteModalProvider, { kind, resource, message, @@ -169,6 +171,7 @@ export const useCommonActions = ( accessReview: asAccessReview(kind as K8sModel, resource as K8sResourceKind, 'patch'), }), }), + // missing launchModal dependency, that causes max depth exceeded error // eslint-disable-next-line react-hooks/exhaustive-deps [kind, resource, t, message, actualEditPath], ); diff --git a/frontend/packages/console-app/src/actions/hooks/useDeploymentActions.ts b/frontend/packages/console-app/src/actions/hooks/useDeploymentActions.ts index df952300a0f..692dee68233 100644 --- a/frontend/packages/console-app/src/actions/hooks/useDeploymentActions.ts +++ b/frontend/packages/console-app/src/actions/hooks/useDeploymentActions.ts @@ -4,7 +4,7 @@ import { Action } from '@console/dynamic-plugin-sdk'; import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay'; import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize'; import { k8sPatchResource } from '@console/dynamic-plugin-sdk/src/utils/k8s/k8s-resource'; -import { configureUpdateStrategyModal } from '@console/internal/components/modals'; +import { LazyConfigureUpdateStrategyModalProvider } from '@console/internal/components/modals'; import { ErrorModal } from '@console/internal/components/modals/error-modal'; import { asAccessReview } from '@console/internal/components/utils/rbac'; import { resourceObjPath } from '@console/internal/components/utils/resource-link'; @@ -16,7 +16,7 @@ import { k8sCreate, K8sModel, } from '@console/internal/module/k8s'; -import { resourceLimitsModal } from '../../components/modals/resource-limits'; +import { LazyResourceLimitsModalProvider } from '../../components/modals/resource-limits'; import { DeploymentActionCreator, ActionObject } from './types'; const restartRollout = (model: K8sModel | undefined, obj: K8sResourceKind | undefined) => { @@ -107,7 +107,7 @@ export const useDeploymentActions = ({ id: 'edit-update-strategy', label: t('console-app~Edit update strategy'), - cta: () => configureUpdateStrategyModal({ deployment: resource }), + cta: () => launchModal(LazyConfigureUpdateStrategyModalProvider, { deployment: resource }), accessReview: { group: kind?.apiGroup, resource: kind?.plural, @@ -171,7 +171,7 @@ export const useDeploymentActions = - resourceLimitsModal({ + launchModal(LazyResourceLimitsModalProvider, { model: kind, resource, }), @@ -184,7 +184,9 @@ export const useDeploymentActions = , boolean] => { diff --git a/frontend/packages/console-app/src/actions/hooks/useJobActions.ts b/frontend/packages/console-app/src/actions/hooks/useJobActions.ts index 1e1ebd9ea82..8ede8bd511f 100644 --- a/frontend/packages/console-app/src/actions/hooks/useJobActions.ts +++ b/frontend/packages/console-app/src/actions/hooks/useJobActions.ts @@ -52,7 +52,9 @@ export const useJobActions = (obj: JobKind, filterActions?: JobActionCreator[]): accessReview: asAccessReview(JobModel, obj, 'patch'), }), }), - [t, obj, launchModal], + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + [t, obj], ); // filter and initialize requested actions or construct list of all PVCActions diff --git a/frontend/packages/console-app/src/actions/hooks/usePDBActions.ts b/frontend/packages/console-app/src/actions/hooks/usePDBActions.ts index bd3045a587c..4c6067af268 100644 --- a/frontend/packages/console-app/src/actions/hooks/usePDBActions.ts +++ b/frontend/packages/console-app/src/actions/hooks/usePDBActions.ts @@ -2,11 +2,12 @@ import { useMemo } from 'react'; import * as _ from 'lodash'; import { useTranslation } from 'react-i18next'; import { Action } from '@console/dynamic-plugin-sdk'; +import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay'; import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize'; import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook'; import { asAccessReview } from '@console/internal/components/utils/rbac'; import { K8sPodControllerKind, K8sModel, referenceFor } from '@console/internal/module/k8s'; -import { deletePDBModal } from '../../components/pdb/modals'; +import { LazyDeletePDBModalProvider } from '../../components/pdb/modals'; import { PodDisruptionBudgetKind } from '../../components/pdb/types'; import { getPDBResource } from '../../components/pdb/utils/get-pdb-resources'; import { PodDisruptionBudgetModel } from '../../models'; @@ -42,6 +43,7 @@ export const usePDBActions = ( const namespace = resource?.metadata?.namespace; const memoizedFilterActions = useDeepCompareMemoize(filterActions); const { t } = useTranslation(); + const launchModal = useOverlay(); const watchedResource = useMemo( () => ({ isList: true, @@ -88,15 +90,16 @@ export const usePDBActions = ( id: 'delete-pdb', label: t('console-app~Remove PodDisruptionBudget'), insertBefore: 'edit-resource-limits', - cta: () => { - deletePDBModal({ + cta: () => + launchModal(LazyDeletePDBModalProvider, { workloadName: resource.metadata.name, pdb: matchedPDB, - }); - }, + }), accessReview: asAccessReview(kindObj, resource, 'delete'), }), }; + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps }, [loaded, kindObj, resource, matchedPDB, t]); const actions = useMemo(() => { diff --git a/frontend/packages/console-app/src/actions/hooks/usePVCActions.ts b/frontend/packages/console-app/src/actions/hooks/usePVCActions.ts index 47b6d02431e..33198010b57 100644 --- a/frontend/packages/console-app/src/actions/hooks/usePVCActions.ts +++ b/frontend/packages/console-app/src/actions/hooks/usePVCActions.ts @@ -4,8 +4,11 @@ import { ModifyVACModal } from '@console/app/src/components/modals/modify-vac-mo import { Action } from '@console/dynamic-plugin-sdk'; import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay'; import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize'; -import { clonePVCModal, expandPVCModal } from '@console/internal/components/modals'; -import deletePVCModal from '@console/internal/components/modals/delete-pvc-modal'; +import { + LazyClonePVCModalProvider, + LazyExpandPVCModalProvider, +} from '@console/internal/components/modals'; +import { DeletePVCModalProvider } from '@console/internal/components/modals/delete-pvc-modal'; import { asAccessReview } from '@console/internal/components/utils/rbac'; import { VolumeSnapshotModel, PersistentVolumeClaimModel } from '@console/internal/models'; import { PersistentVolumeClaimKind } from '@console/internal/module/k8s'; @@ -46,7 +49,7 @@ export const usePVCActions = ( id: 'expand-pvc', label: t('console-app~Expand PVC'), cta: () => - expandPVCModal({ + launchModal(LazyExpandPVCModalProvider, { kind: PersistentVolumeClaimModel, resource: obj, }), @@ -67,11 +70,7 @@ export const usePVCActions = ( label: t('console-app~Clone PVC'), disabled: obj?.status?.phase !== 'Bound', tooltip: obj?.status?.phase !== 'Bound' ? t('console-app~PVC is not Bound') : '', - cta: () => - clonePVCModal({ - kind: PersistentVolumeClaimModel, - resource: obj, - }), + cta: () => launchModal(LazyClonePVCModalProvider, { resource: obj }), accessReview: asAccessReview(PersistentVolumeClaimModel, obj, 'create'), }), [PVCActionCreator.ModifyVAC]: () => ({ @@ -88,14 +87,13 @@ export const usePVCActions = ( [PVCActionCreator.DeletePVC]: () => ({ id: 'delete-pvc', label: t('public~Delete PersistentVolumeClaim'), - cta: () => - deletePVCModal({ - pvc: obj, - }), + cta: () => launchModal(DeletePVCModalProvider, { pvc: obj }), accessReview: asAccessReview(PersistentVolumeClaimModel, obj, 'delete'), }), }), - [t, obj, launchModal], + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + [t, obj], ); // filter and initialize requested actions or construct list of all PVCActions diff --git a/frontend/packages/console-app/src/actions/hooks/useRetryRolloutAction.ts b/frontend/packages/console-app/src/actions/hooks/useRetryRolloutAction.ts index 4b04818a503..e665c45e777 100644 --- a/frontend/packages/console-app/src/actions/hooks/useRetryRolloutAction.ts +++ b/frontend/packages/console-app/src/actions/hooks/useRetryRolloutAction.ts @@ -95,6 +95,8 @@ export const useRetryRolloutAction = (resource: DeploymentConfigKind): Action => verb: 'patch', }, }), - [t, dcModel, rcModel, rc, canRetry, resource, launchModal], + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + [t, dcModel, rcModel, rc, canRetry, resource], ); }; diff --git a/frontend/packages/console-app/src/actions/hooks/useVolumeSnapshotActions.ts b/frontend/packages/console-app/src/actions/hooks/useVolumeSnapshotActions.ts index 261475fcd05..66adf588f9f 100644 --- a/frontend/packages/console-app/src/actions/hooks/useVolumeSnapshotActions.ts +++ b/frontend/packages/console-app/src/actions/hooks/useVolumeSnapshotActions.ts @@ -1,8 +1,9 @@ import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Action } from '@console/dynamic-plugin-sdk'; +import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay'; import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize'; -import { restorePVCModal } from '@console/internal/components/modals'; +import { LazyRestorePVCModalProvider } from '@console/internal/components/modals'; import { asAccessReview } from '@console/internal/components/utils/rbac'; import { VolumeSnapshotModel } from '@console/internal/models'; import { VolumeSnapshotKind } from '@console/internal/module/k8s'; @@ -32,6 +33,7 @@ export const useVolumeSnapshotActions = ( filterActions?: VolumeSnapshotActionCreator[], ): Action[] => { const { t } = useTranslation(); + const launchModal = useOverlay(); const memoizedFilterActions = useDeepCompareMemoize(filterActions); @@ -43,13 +45,14 @@ export const useVolumeSnapshotActions = ( disabled: !resource?.status?.readyToUse, tooltip: !resource?.status?.readyToUse ? t('console-app~Volume Snapshot is not Ready') : '', cta: () => - restorePVCModal({ - kind: VolumeSnapshotModel, + launchModal(LazyRestorePVCModalProvider, { resource, }), accessReview: asAccessReview(VolumeSnapshotModel, resource, 'create'), }), }), + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps [t, resource], ); diff --git a/frontend/packages/console-app/src/actions/providers/build-config-provider.ts b/frontend/packages/console-app/src/actions/providers/build-config-provider.ts index e27a22ca6ef..e6af5e5d41a 100644 --- a/frontend/packages/console-app/src/actions/providers/build-config-provider.ts +++ b/frontend/packages/console-app/src/actions/providers/build-config-provider.ts @@ -33,7 +33,9 @@ const useStartBuildAction = (obj: BuildConfig): Action[] => { accessReview: asAccessReview(BuildConfigModel, buildConfig, 'create', 'instantiate'), }), }), - [launchModal, t], + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + [t], ); const actions = useMemo(() => [factory[BuildConfigActionCreator.StartBuild](obj)], [ factory, @@ -66,7 +68,9 @@ const useStartLastBuildAction = ( accessReview: asAccessReview(BuildConfigModel, latestBuild, 'create', 'instantiate'), }), }), - [latestBuild, launchModal, t], + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + [latestBuild, t], ); const actions = useMemo( () => (latestBuild ? [factory[BuildConfigActionCreator.StartLastRun]()] : []), diff --git a/frontend/packages/console-app/src/actions/providers/deployment-provider.ts b/frontend/packages/console-app/src/actions/providers/deployment-provider.ts index 9802d8ad741..c4a0c4d9077 100644 --- a/frontend/packages/console-app/src/actions/providers/deployment-provider.ts +++ b/frontend/packages/console-app/src/actions/providers/deployment-provider.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react'; -import { DeleteResourceAction } from '@console/dev-console/src/actions/context-menu'; +import { useDeleteResourceAction } from '@console/dev-console/src/actions/context-menu'; import { Action } from '@console/dynamic-plugin-sdk/src'; import { DeploymentKind, referenceFor } from '@console/internal/module/k8s'; import { useK8sModel } from '@console/shared/src/hooks/useK8sModel'; @@ -14,6 +14,7 @@ export const useDeploymentActionsProvider = (resource: DeploymentKind) => { const [kindObj, inFlight] = useK8sModel(referenceFor(resource)); const [hpaActions, relatedHPAs] = useHPAActions(kindObj, resource); const [pdbActions] = usePDBActions(kindObj, resource); + const deleteResourceAction = useDeleteResourceAction(kindObj, resource); const [deploymentActionsObject, deploymentActionsReady] = useDeploymentActions( kindObj, resource, @@ -54,7 +55,7 @@ export const useDeploymentActionsProvider = (resource: DeploymentKind) => { deploymentActionsObject.EditDeployment, ...(resource.metadata?.annotations?.['openshift.io/generated-by'] === 'OpenShiftWebConsole' - ? [DeleteResourceAction(kindObj, resource)] + ? [deleteResourceAction] : [commonActions.Delete]), ]; }, [ @@ -66,6 +67,7 @@ export const useDeploymentActionsProvider = (resource: DeploymentKind) => { commonActions, isReady, deploymentActionsObject, + deleteResourceAction, ]); return [deploymentActions, !inFlight, undefined]; diff --git a/frontend/packages/console-app/src/actions/providers/deploymentconfig-provider.ts b/frontend/packages/console-app/src/actions/providers/deploymentconfig-provider.ts index 465018427c8..31900dd7355 100644 --- a/frontend/packages/console-app/src/actions/providers/deploymentconfig-provider.ts +++ b/frontend/packages/console-app/src/actions/providers/deploymentconfig-provider.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react'; -import { DeleteResourceAction } from '@console/dev-console/src/actions/context-menu'; +import { useDeleteResourceAction } from '@console/dev-console/src/actions/context-menu'; import { DeploymentConfigKind, referenceFor } from '@console/internal/module/k8s'; import { useK8sModel } from '@console/shared/src/hooks/useK8sModel'; import { getHealthChecksAction } from '../creators/health-checks-factory'; @@ -15,6 +15,7 @@ export const useDeploymentConfigActionsProvider = (resource: DeploymentConfigKin const [hpaActions, relatedHPAs] = useHPAActions(kindObj, resource); const [pdbActions] = usePDBActions(kindObj, resource); const retryRolloutAction = useRetryRolloutAction(resource); + const deleteResourceAction = useDeleteResourceAction(kindObj, resource); const [deploymentActions, deploymentActionsReady] = useDeploymentActions(kindObj, resource, [ DeploymentActionCreator.StartDCRollout, DeploymentActionCreator.PauseRollout, @@ -50,7 +51,7 @@ export const useDeploymentConfigActionsProvider = (resource: DeploymentConfigKin deploymentActions.EditDeployment, ...(resource.metadata?.annotations?.['openshift.io/generated-by'] === 'OpenShiftWebConsole' - ? [DeleteResourceAction(kindObj, resource)] + ? [deleteResourceAction] : [commonActions.Delete]), ] : [], @@ -64,6 +65,7 @@ export const useDeploymentConfigActionsProvider = (resource: DeploymentConfigKin commonActions, deploymentActions, isReady, + deleteResourceAction, ], ); diff --git a/frontend/packages/console-app/src/actions/providers/machine-config-pool-provider.ts b/frontend/packages/console-app/src/actions/providers/machine-config-pool-provider.ts index 4a02c679526..8b30f2e88ae 100644 --- a/frontend/packages/console-app/src/actions/providers/machine-config-pool-provider.ts +++ b/frontend/packages/console-app/src/actions/providers/machine-config-pool-provider.ts @@ -24,7 +24,9 @@ const usePauseAction = (obj: MachineConfigPoolKind): Action[] => { accessReview: asAccessReview(MachineConfigPoolModel, obj, 'patch'), }), }), - [launchModal, obj, t], + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + [obj, t], ); const action = useMemo(() => [factory.PauseUpdates()], [factory]); diff --git a/frontend/packages/console-app/src/components/modals/clone/clone-pvc-modal.tsx b/frontend/packages/console-app/src/components/modals/clone/clone-pvc-modal.tsx index 3b2df85af25..51b420a7991 100644 --- a/frontend/packages/console-app/src/components/modals/clone/clone-pvc-modal.tsx +++ b/frontend/packages/console-app/src/components/modals/clone/clone-pvc-modal.tsx @@ -8,12 +8,13 @@ import { TextInput, } from '@patternfly/react-core'; import { useTranslation } from 'react-i18next'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; import { ModalBody, ModalComponentProps, ModalSubmitFooter, ModalTitle, - createModalLauncher, + ModalWrapper, } from '@console/internal/components/factory'; import { DataPoint } from '@console/internal/components/graphs'; import { PrometheusEndpoint } from '@console/internal/components/graphs/helpers'; @@ -275,4 +276,13 @@ export type ClonePVCModalProps = { resource?: PersistentVolumeClaimKind; } & ModalComponentProps; -export default createModalLauncher(ClonePVCModal); +export const ClonePVCModalProvider: OverlayComponent = (props) => { + return ( + + + + ); +}; + +// For backward compatibility with the index.ts re-export +export default ClonePVCModalProvider; diff --git a/frontend/packages/console-app/src/components/modals/resource-limits/ResourceLimitsModalLauncher.tsx b/frontend/packages/console-app/src/components/modals/resource-limits/ResourceLimitsModalLauncher.tsx index 4349768d61c..47c7af04f12 100644 --- a/frontend/packages/console-app/src/components/modals/resource-limits/ResourceLimitsModalLauncher.tsx +++ b/frontend/packages/console-app/src/components/modals/resource-limits/ResourceLimitsModalLauncher.tsx @@ -4,7 +4,8 @@ import { TFunction } from 'i18next'; import { useTranslation } from 'react-i18next'; import * as yup from 'yup'; import { limitsValidationSchema } from '@console/dev-console/src/components/import/validation-schema'; -import { createModalLauncher, ModalComponentProps } from '@console/internal/components/factory'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; +import { ModalComponentProps, ModalWrapper } from '@console/internal/components/factory'; import { K8sKind, k8sPatch, K8sResourceKind } from '@console/internal/module/k8s'; import { getLimitsDataFromResource, getResourceLimitsData } from '@console/shared/src'; import ResourceLimitsModal from './ResourceLimitsModal'; @@ -60,6 +61,13 @@ const ResourceLimitsModalLauncher: FC = (props ); }; -export const resourceLimitsModal = createModalLauncher( - (props: ResourceLimitsModalLauncherProps) => , +export const ResourceLimitsModalProvider: OverlayComponent = ( + props, +) => ( + + + ); + +// For backward compatibility with the index.ts re-export +export default ResourceLimitsModalProvider; diff --git a/frontend/packages/console-app/src/components/modals/resource-limits/index.ts b/frontend/packages/console-app/src/components/modals/resource-limits/index.ts index 6329d442d18..40dd493334b 100644 --- a/frontend/packages/console-app/src/components/modals/resource-limits/index.ts +++ b/frontend/packages/console-app/src/components/modals/resource-limits/index.ts @@ -1,4 +1,10 @@ -export const resourceLimitsModal = (props) => - import( - './ResourceLimitsModalLauncher' /* webpackChunkName: "resource-limits-modal" */ - ).then((m) => m.resourceLimitsModal(props)); +import { lazy } from 'react'; + +// Lazy-loaded OverlayComponent for Resource Limits Modal +export const LazyResourceLimitsModalProvider = lazy(() => + import('./ResourceLimitsModalLauncher' /* webpackChunkName: "resource-limits-modal" */).then( + (m) => ({ + default: m.default, + }), + ), +); diff --git a/frontend/packages/console-app/src/components/modals/restore-pvc/restore-pvc-modal.tsx b/frontend/packages/console-app/src/components/modals/restore-pvc/restore-pvc-modal.tsx index f3c2492e01c..dcc161df17c 100644 --- a/frontend/packages/console-app/src/components/modals/restore-pvc/restore-pvc-modal.tsx +++ b/frontend/packages/console-app/src/components/modals/restore-pvc/restore-pvc-modal.tsx @@ -11,12 +11,13 @@ import { } from '@patternfly/react-core'; import { Trans, useTranslation } from 'react-i18next'; import { VolumeModeSelector } from '@console/app/src/components/volume-modes/volume-mode'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; import { ModalBody, ModalComponentProps, ModalSubmitFooter, ModalTitle, - createModalLauncher, + ModalWrapper, } from '@console/internal/components/factory'; import { dropdownUnits, @@ -278,4 +279,13 @@ type RestorePVCModalProps = { resource: VolumeSnapshotKind; } & ModalComponentProps; -export default createModalLauncher(RestorePVCModal); +export const RestorePVCModalProvider: OverlayComponent = (props) => { + return ( + + + + ); +}; + +// For backward compatibility with the index.ts re-export +export default RestorePVCModalProvider; diff --git a/frontend/packages/console-app/src/components/nodes/menu-actions.tsx b/frontend/packages/console-app/src/components/nodes/menu-actions.tsx index c8683b9cd01..afffb199c9e 100644 --- a/frontend/packages/console-app/src/components/nodes/menu-actions.tsx +++ b/frontend/packages/console-app/src/components/nodes/menu-actions.tsx @@ -2,6 +2,7 @@ import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { useCommonResourceActions } from '@console/app/src/actions//hooks/useCommonResourceActions'; import { Action } from '@console/dynamic-plugin-sdk'; +import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay'; import { useK8sModel } from '@console/dynamic-plugin-sdk/src/lib-core'; import { k8sUpdateResource } from '@console/dynamic-plugin-sdk/src/utils/k8s'; import { asAccessReview } from '@console/internal/components/utils/rbac'; @@ -14,7 +15,7 @@ import { } from '@console/internal/module/k8s'; import { isNodeUnschedulable } from '@console/shared/src/selectors/node'; import { makeNodeSchedulable } from '../../k8s/requests/nodes'; -import { createConfigureUnschedulableModal } from './modals'; +import { LazyConfigureUnschedulableModalProvider } from './modals'; const updateCSR = (csr: CertificateSigningRequestKind, type: 'Approved' | 'Denied') => { const approvedCSR = { @@ -47,6 +48,7 @@ export const denyCSR = (csr: CertificateSigningRequestKind) => updateCSR(csr, 'D export const useNodeActions: ExtensionHook = (obj) => { const [kindObj, inFlight] = useK8sModel(referenceFor(obj)); const { t } = useTranslation(); + const launchModal = useOverlay(); const deleteMessage = useMemo( () => (

@@ -71,13 +73,15 @@ export const useNodeActions: ExtensionHook = (obj) => { actions.push({ id: 'mark-as-unschedulable', label: t('console-app~Mark as unschedulable'), - cta: () => createConfigureUnschedulableModal({ resource: obj }), + cta: () => launchModal(LazyConfigureUnschedulableModalProvider, { resource: obj }), accessReview: asAccessReview(kindObj, obj, 'patch'), }); } actions.push(...commonActions); return actions; + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps }, [kindObj, obj, t, commonActions]); return [nodeActions, !inFlight, undefined]; diff --git a/frontend/packages/console-app/src/components/nodes/modals/ConfigureUnschedulableModal.tsx b/frontend/packages/console-app/src/components/nodes/modals/ConfigureUnschedulableModal.tsx index d9716ee353b..895f23500a3 100644 --- a/frontend/packages/console-app/src/components/nodes/modals/ConfigureUnschedulableModal.tsx +++ b/frontend/packages/console-app/src/components/nodes/modals/ConfigureUnschedulableModal.tsx @@ -1,10 +1,12 @@ import type { FC } from 'react'; import { useTranslation } from 'react-i18next'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; import { ModalTitle, ModalBody, ModalSubmitFooter, - createModalLauncher, + ModalComponentProps, + ModalWrapper, } from '@console/internal/components/factory/modal'; import { NodeKind } from '@console/internal/module/k8s'; import { usePromiseHandler } from '@console/shared/src/hooks/promise-handler'; @@ -12,9 +14,7 @@ import { makeNodeUnschedulable } from '../../../k8s/requests/nodes'; type ConfigureUnschedulableModalProps = { resource: NodeKind; - cancel?: () => void; - close?: () => void; -}; +} & ModalComponentProps; const ConfigureUnschedulableModal: FC = ({ resource, @@ -48,4 +48,17 @@ const ConfigureUnschedulableModal: FC = ({ ); }; -export default createModalLauncher(ConfigureUnschedulableModal); +export const ConfigureUnschedulableModalProvider: OverlayComponent = ( + props, +) => ( + + + +); + +// For backward compatibility with the index.ts re-export +export default ConfigureUnschedulableModalProvider; diff --git a/frontend/packages/console-app/src/components/nodes/modals/index.ts b/frontend/packages/console-app/src/components/nodes/modals/index.ts index 222850138c8..f1b19f6ab61 100644 --- a/frontend/packages/console-app/src/components/nodes/modals/index.ts +++ b/frontend/packages/console-app/src/components/nodes/modals/index.ts @@ -1,6 +1,10 @@ -import { NodeKind } from '@console/internal/module/k8s'; +import { lazy } from 'react'; -export const createConfigureUnschedulableModal = (props: { resource: NodeKind }) => +// Lazy-loaded OverlayComponent for Configure Unschedulable Modal +export const LazyConfigureUnschedulableModalProvider = lazy(() => import( './ConfigureUnschedulableModal' /* webpackChunkName: "configure-unschedulable-modal" */ - ).then((m) => m.default(props)); + ).then((m) => ({ + default: m.default, + })), +); diff --git a/frontend/packages/console-app/src/components/pdb/modals/DeletePDBModal.tsx b/frontend/packages/console-app/src/components/pdb/modals/DeletePDBModal.tsx index 18a7121fb07..ee514fbf0ae 100644 --- a/frontend/packages/console-app/src/components/pdb/modals/DeletePDBModal.tsx +++ b/frontend/packages/console-app/src/components/pdb/modals/DeletePDBModal.tsx @@ -4,12 +4,13 @@ import { Form } from '@patternfly/react-core'; import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon'; import { t_global_icon_color_status_warning_default as warningColor } from '@patternfly/react-tokens'; import { useTranslation, Trans } from 'react-i18next'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; import { - createModalLauncher, ModalBody, ModalComponentProps, ModalSubmitFooter, ModalTitle, + ModalWrapper, } from '@console/internal/components/factory/modal'; import { LoadingInline } from '@console/internal/components/utils/status-box'; import { k8sKill } from '@console/internal/module/k8s'; @@ -72,9 +73,16 @@ const DeletePDBModal: FC = ({ close, pdb, workloadName }) = ); }; -export const deletePDBModal = createModalLauncher(DeletePDBModal); +export const DeletePDBModalProvider: OverlayComponent = (props) => ( + + + +); export type DeletePDBModalProps = ModalComponentProps & { pdb: PodDisruptionBudgetKind; workloadName: string; }; + +// For backward compatibility with the index.ts re-export +export default DeletePDBModalProvider; diff --git a/frontend/packages/console-app/src/components/pdb/modals/index.ts b/frontend/packages/console-app/src/components/pdb/modals/index.ts index 6643d2aa108..ebe2ba437b5 100644 --- a/frontend/packages/console-app/src/components/pdb/modals/index.ts +++ b/frontend/packages/console-app/src/components/pdb/modals/index.ts @@ -1,6 +1,8 @@ -import { DeletePDBModalProps } from './DeletePDBModal'; +import { lazy } from 'react'; -export const deletePDBModal = (props: DeletePDBModalProps) => - import('./DeletePDBModal' /* webpackChunkName: "shared-modals" */).then((m) => - m.deletePDBModal(props), - ); +// Lazy-loaded OverlayComponent for Delete PDB Modal +export const LazyDeletePDBModalProvider = lazy(() => + import('./DeletePDBModal' /* webpackChunkName: "delete-pdb-modal" */).then((m) => ({ + default: m.default, + })), +); diff --git a/frontend/packages/console-dynamic-plugin-sdk/src/app/modal-support/OverlayProvider.tsx b/frontend/packages/console-dynamic-plugin-sdk/src/app/modal-support/OverlayProvider.tsx index c31b61a756f..961663a6b0a 100644 --- a/frontend/packages/console-dynamic-plugin-sdk/src/app/modal-support/OverlayProvider.tsx +++ b/frontend/packages/console-dynamic-plugin-sdk/src/app/modal-support/OverlayProvider.tsx @@ -1,5 +1,5 @@ import type { FC, ReactNode } from 'react'; -import { createContext, useState, useCallback } from 'react'; +import { createContext, useState, useCallback, Suspense } from 'react'; import * as _ from 'lodash'; import { UnknownProps } from '../common-types'; @@ -52,7 +52,9 @@ export const OverlayProvider: FC = ({ children }) => { return ( {_.map(componentsMap, (c, id) => ( - closeOverlay(id)} /> + + closeOverlay(id)} /> + ))} {children} diff --git a/frontend/packages/console-shared/src/components/formik-fields/EnvironmentField.tsx b/frontend/packages/console-shared/src/components/formik-fields/EnvironmentField.tsx index b81a4349985..ad7e7cdd994 100644 --- a/frontend/packages/console-shared/src/components/formik-fields/EnvironmentField.tsx +++ b/frontend/packages/console-shared/src/components/formik-fields/EnvironmentField.tsx @@ -75,7 +75,9 @@ const EnvironmentField: FC = ({ } catch (e) {} } }); - }, [namespace, launchModal]); + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [namespace]); return ( diff --git a/frontend/packages/dev-console/src/actions/context-menu.ts b/frontend/packages/dev-console/src/actions/context-menu.ts index 4d580b77529..8be43358493 100644 --- a/frontend/packages/dev-console/src/actions/context-menu.ts +++ b/frontend/packages/dev-console/src/actions/context-menu.ts @@ -1,7 +1,10 @@ +import { useMemo } from 'react'; import i18next from 'i18next'; +import { useTranslation } from 'react-i18next'; import { Action, K8sModel } from '@console/dynamic-plugin-sdk'; +import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay'; import { TopologyApplicationObject } from '@console/dynamic-plugin-sdk/src/extensions/topology-types'; -import { deleteModal } from '@console/internal/components/modals'; +import { LazyDeleteModalProvider } from '@console/internal/components/modals'; import { asAccessReview } from '@console/internal/components/utils'; import { K8sResourceKind } from '@console/internal/module/k8s'; import { deleteResourceModal } from '@console/shared'; @@ -36,14 +39,24 @@ export const DeleteApplicationAction = ( }; }; -export const DeleteResourceAction = (kind: K8sModel, obj: K8sResourceKind): Action => ({ - id: `delete-resource`, - label: i18next.t('devconsole~Delete {{kind}}', { kind: kind.kind }), - cta: () => - deleteModal({ - kind, - resource: obj, - deleteAllResources: () => cleanUpWorkload(obj), +export const useDeleteResourceAction = (kind: K8sModel, obj: K8sResourceKind): Action => { + const { t } = useTranslation(); + const launchModal = useOverlay(); + + return useMemo( + () => ({ + id: `delete-resource`, + label: t('devconsole~Delete {{kind}}', { kind: kind.kind }), + cta: () => + launchModal(LazyDeleteModalProvider, { + kind, + resource: obj, + deleteAllResources: () => cleanUpWorkload(obj), + }), + accessReview: asAccessReview(kind, obj, 'delete'), }), - accessReview: asAccessReview(kind, obj, 'delete'), -}); + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + [t, kind, obj], + ); +}; diff --git a/frontend/packages/knative-plugin/src/actions/creators.ts b/frontend/packages/knative-plugin/src/actions/creators.ts index a5d07e7316b..f01eae935bf 100644 --- a/frontend/packages/knative-plugin/src/actions/creators.ts +++ b/frontend/packages/knative-plugin/src/actions/creators.ts @@ -1,7 +1,8 @@ import { useMemo } from 'react'; import i18next from 'i18next'; import { Action } from '@console/dynamic-plugin-sdk'; -import { deleteModal } from '@console/internal/components/modals'; +import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay'; +import { LazyDeleteModalProvider } from '@console/internal/components/modals'; import { asAccessReview, resourceObjPath } from '@console/internal/components/utils'; import { truncateMiddle } from '@console/internal/components/utils/truncate-middle'; import { K8sKind, K8sResourceKind, referenceForModel } from '@console/internal/module/k8s'; @@ -116,32 +117,42 @@ export const editKnativeServiceResource = ( }; }; -export const deleteKnativeServiceResource = ( +export const useDeleteKnativeServiceResource = ( kind: K8sKind, obj: K8sResourceKind, serviceTypeValue: ServiceTypeValue, serviceCreatedFromWebFlag: boolean, -): Action => ({ - id: `delete-resource`, - label: - serviceTypeValue === ServiceTypeValue.Function - ? i18next.t('knative-plugin~Delete Function') - : i18next.t('knative-plugin~Delete Service'), - cta: () => - deleteModal( - serviceCreatedFromWebFlag - ? { - kind, - resource: obj, - deleteAllResources: () => cleanUpWorkload(obj), - } - : { - kind, - resource: obj, - }, - ), - accessReview: asAccessReview(kind, obj, 'delete'), -}); +): Action => { + const launchModal = useOverlay(); + + return useMemo( + () => ({ + id: `delete-resource`, + label: + serviceTypeValue === ServiceTypeValue.Function + ? i18next.t('knative-plugin~Delete Function') + : i18next.t('knative-plugin~Delete Service'), + cta: () => + launchModal( + LazyDeleteModalProvider, + serviceCreatedFromWebFlag + ? { + kind, + resource: obj, + deleteAllResources: () => cleanUpWorkload(obj), + } + : { + kind, + resource: obj, + }, + ), + accessReview: asAccessReview(kind, obj, 'delete'), + }), + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + [kind, obj, serviceTypeValue, serviceCreatedFromWebFlag], + ); +}; export const moveSinkSource = ( model: K8sKind, diff --git a/frontend/packages/knative-plugin/src/actions/providers.ts b/frontend/packages/knative-plugin/src/actions/providers.ts index a43f77c03cf..fac3bdd5af9 100644 --- a/frontend/packages/knative-plugin/src/actions/providers.ts +++ b/frontend/packages/knative-plugin/src/actions/providers.ts @@ -58,7 +58,7 @@ import { editKnativeService, moveSinkSource, editKnativeServiceResource, - deleteKnativeServiceResource, + useDeleteKnativeServiceResource, useDeleteRevisionAction, useSetTrafficDistributionAction, useMoveSinkPubsubAction, @@ -95,6 +95,18 @@ export const useKnativeServiceActionsProvider = (resource: K8sResourceKind) => { const serviceTypeValue = useContext(KnativeServiceTypeContext); const setTrafficDistributionAction = useSetTrafficDistributionAction(kindObj, resource); const testServerlessFunctionAction = useTestServerlessFunctionAction(kindObj, resource); + const deleteKnativeServiceFromWebAction = useDeleteKnativeServiceResource( + kindObj, + resource, + serviceTypeValue, + true, + ); + const deleteKnativeServiceAction = useDeleteKnativeServiceResource( + kindObj, + resource, + serviceTypeValue, + false, + ); const [deploymentActions, deploymentActionsReady] = useDeploymentActions(kindObj, resource, [ DeploymentActionCreator.EditResourceLimits, ] as const); @@ -119,8 +131,8 @@ export const useKnativeServiceActionsProvider = (resource: K8sResourceKind) => { editKnativeServiceResource(kindObj, resource, serviceTypeValue), ...(resource.metadata.annotations?.['openshift.io/generated-by'] === 'OpenShiftWebConsole' - ? [deleteKnativeServiceResource(kindObj, resource, serviceTypeValue, true)] - : [deleteKnativeServiceResource(kindObj, resource, serviceTypeValue, false)]), + ? [deleteKnativeServiceFromWebAction] + : [deleteKnativeServiceAction]), ...(resource?.metadata?.labels?.['function.knative.dev'] === 'true' ? [testServerlessFunctionAction] : []), @@ -134,6 +146,8 @@ export const useKnativeServiceActionsProvider = (resource: K8sResourceKind) => { commonActions, serviceTypeValue, testServerlessFunctionAction, + deleteKnativeServiceFromWebAction, + deleteKnativeServiceAction, ], ); diff --git a/frontend/packages/knative-plugin/src/components/add/SecretKeySelector.tsx b/frontend/packages/knative-plugin/src/components/add/SecretKeySelector.tsx index d17af7bb5f1..0b028203c62 100644 --- a/frontend/packages/knative-plugin/src/components/add/SecretKeySelector.tsx +++ b/frontend/packages/knative-plugin/src/components/add/SecretKeySelector.tsx @@ -58,7 +58,9 @@ const SecretKeySelector: FC = ({ launchModal(ErrorModal, { error: err?.message }); } }); - }, [namespace, launchModal]); + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [namespace]); return ( diff --git a/frontend/packages/shipwright-plugin/src/actions/useBuildActions.ts b/frontend/packages/shipwright-plugin/src/actions/useBuildActions.ts index df0501c1d3f..6a8f6b3db4c 100644 --- a/frontend/packages/shipwright-plugin/src/actions/useBuildActions.ts +++ b/frontend/packages/shipwright-plugin/src/actions/useBuildActions.ts @@ -88,7 +88,9 @@ const useBuildActions = (build: Build) => { }); actions.push(commonActions.Delete); return actions; - }, [t, build, navigate, commonActions, isReady, launchModal]); + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [t, build, navigate, commonActions, isReady]); return [actionsMenu, !inFlight, undefined]; }; diff --git a/frontend/packages/shipwright-plugin/src/actions/useBuildRunActions.ts b/frontend/packages/shipwright-plugin/src/actions/useBuildRunActions.ts index aa9dce0302a..7a508342666 100644 --- a/frontend/packages/shipwright-plugin/src/actions/useBuildRunActions.ts +++ b/frontend/packages/shipwright-plugin/src/actions/useBuildRunActions.ts @@ -42,7 +42,9 @@ const useBuildRunActions = (buildRun: BuildRun) => { }; return [...(canRerunBuildRun(buildRun) ? [rerun] : []), ...commonActions]; - }, [t, buildRun, navigate, commonActions, launchModal]); + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [t, buildRun, navigate, commonActions]); return [actions, !inFlight, undefined]; }; diff --git a/frontend/public/components/app.tsx b/frontend/public/components/app.tsx index 4fae8fd33e0..a1fe2e4db8f 100644 --- a/frontend/public/components/app.tsx +++ b/frontend/public/components/app.tsx @@ -5,6 +5,7 @@ import type { FC, Provider as ProviderComponent, ReactNode } from 'react'; import { render } from 'react-dom'; import { Helmet, HelmetProvider } from 'react-helmet-async'; import { linkify } from 'react-linkify'; +import * as Modal from 'react-modal'; import { Provider, useSelector, useDispatch } from 'react-redux'; import { Router } from 'react-router-dom'; import { useParams, useLocation, CompatRouter, Routes, Route } from 'react-router-dom-v5-compat'; @@ -136,6 +137,16 @@ const App: FC<{ useCSPViolationDetector(); useNotificationPoller(); + // Initialize react-modal app element for accessibility + // Using useLayoutEffect instead of useEffect to ensure it runs synchronously after DOM updates + // and before any paint, reducing the chance of modals rendering before the app element is set + useLayoutEffect(() => { + const appElement = document.getElementById('app-content'); + if (appElement) { + Modal.setAppElement(appElement); + } + }, []); + useEffect(() => { window.addEventListener('resize', onResize); return () => { diff --git a/frontend/public/components/edit-yaml.tsx b/frontend/public/components/edit-yaml.tsx index e979649dd4f..1f2b87bba84 100644 --- a/frontend/public/components/edit-yaml.tsx +++ b/frontend/public/components/edit-yaml.tsx @@ -31,7 +31,7 @@ import { } from '@console/dynamic-plugin-sdk'; import { useResolvedExtensions } from '@console/dynamic-plugin-sdk/src/api/useResolvedExtensions'; import { connectToFlags, WithFlagsProps } from '../reducers/connectToFlags'; -import { managedResourceSaveModal } from './modals'; +import { LazyManagedResourceSaveModalProvider } from './modals'; import ReplaceCodeModal from './modals/replace-code-modal'; import { checkAccess } from './utils/rbac'; import { Firehose } from './utils/firehose'; @@ -638,8 +638,7 @@ const EditYAMLInner: FC = (props) => { } if (owner) { - managedResourceSaveModal({ - kind: obj.kind, + launchModal(LazyManagedResourceSaveModalProvider, { resource: obj, onSubmit: () => updateYAML(obj), owner, @@ -648,6 +647,8 @@ const EditYAMLInner: FC = (props) => { } } updateYAML(obj); + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps }, [create, owner, t, updateYAML, validate, onSave, props.obj, editorMounted]); const save = () => { diff --git a/frontend/public/components/factory/modal.tsx b/frontend/public/components/factory/modal.tsx index 06b72acea1b..4957d8b5669 100644 --- a/frontend/public/components/factory/modal.tsx +++ b/frontend/public/components/factory/modal.tsx @@ -24,7 +24,7 @@ export const createModal: CreateModal = (getModalElement) => { ReactDOM.unmountComponentAtNode(containerElement); resolve(); }; - Modal.setAppElement(document.getElementById('app-content')); + // Modal app element is now set globally in App component containerElement && ReactDOM.render(getModalElement(closeModal), containerElement); }); return { result }; @@ -34,6 +34,11 @@ export const createModal: CreateModal = (getModalElement) => { export const ModalWrapper: FC = ({ blocking, className, children, onClose }) => { const { t } = useTranslation(); const parentSelector = useCallback(() => document.querySelector('#modal-container'), []); + + // Explicitly set appElement to avoid timing issues with the global Modal.setAppElement() + // This ensures each modal instance knows which element to set aria-hidden on + const appElement = document.querySelector('#app-content') || document.querySelector('#app'); + return ( = ({ blocking, className, child onRequestClose={onClose} overlayClassName="co-overlay" parentSelector={parentSelector} + appElement={appElement} shouldCloseOnOverlayClick={!blocking} > {children} diff --git a/frontend/public/components/modals/configure-cluster-upstream-modal.tsx b/frontend/public/components/modals/configure-cluster-upstream-modal.tsx index 51e920b0787..a581635c92e 100644 --- a/frontend/public/components/modals/configure-cluster-upstream-modal.tsx +++ b/frontend/public/components/modals/configure-cluster-upstream-modal.tsx @@ -20,8 +20,9 @@ import { ModalComponentProps, ModalSubmitFooter, ModalTitle, - createModalLauncher, + ModalWrapper, } from '../factory/modal'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; import { ExternalLink } from '@console/shared/src/components/links/ExternalLink'; import { documentationURLs, @@ -30,7 +31,6 @@ import { isUpstream, } from '../utils/documentation'; import { useTranslation } from 'react-i18next'; -import { TFunction } from 'i18next'; import { CLUSTER_VERSION_DEFAULT_UPSTREAM_SERVER_URL_PLACEHOLDER } from '@console/shared/src/constants'; import { usePromiseHandler } from '@console/shared/src/hooks/promise-handler'; @@ -166,9 +166,23 @@ export const ConfigureClusterUpstreamModal = (props: ConfigureClusterUpstreamMod ); }; -export const configureClusterUpstreamModal = createModalLauncher(ConfigureClusterUpstreamModal); +export const ConfigureClusterUpstreamModalProvider: OverlayComponent = ( + props, +) => { + return ( + + + + ); +}; + +// For backward compatibility with the index.ts re-export +export default ConfigureClusterUpstreamModalProvider; export type ConfigureClusterUpstreamModalProps = { cv: ClusterVersionKind; - t: TFunction; } & ModalComponentProps; diff --git a/frontend/public/components/modals/configure-ns-pull-secret-modal.tsx b/frontend/public/components/modals/configure-ns-pull-secret-modal.tsx index 8532818499d..aed60a3b60f 100644 --- a/frontend/public/components/modals/configure-ns-pull-secret-modal.tsx +++ b/frontend/public/components/modals/configure-ns-pull-secret-modal.tsx @@ -16,14 +16,15 @@ import { useTranslation } from 'react-i18next'; import type { FC, ChangeEvent, FormEvent } from 'react'; import { CONST } from '@console/shared'; import { usePromiseHandler } from '@console/shared/src/hooks/promise-handler'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; import { k8sPatchByName, k8sCreate, K8sResourceKind } from '../../module/k8s'; import { SecretModel, ServiceAccountModel } from '../../models'; import { useState, useCallback } from 'react'; import { - createModalLauncher, ModalTitle, ModalBody, ModalSubmitFooter, + ModalWrapper, ModalComponentProps, } from '../factory/modal'; import { ResourceIcon } from '../utils/resource-icon'; @@ -313,4 +314,19 @@ const ConfigureNamespacePullSecret: FC = (pro ); }; -export const configureNamespacePullSecretModal = createModalLauncher(ConfigureNamespacePullSecret); +export const ConfigureNamespacePullSecretModalProvider: OverlayComponent = ( + props, +) => { + return ( + + + + ); +}; + +// For backward compatibility with the index.ts re-export +export default ConfigureNamespacePullSecretModalProvider; diff --git a/frontend/public/components/modals/configure-update-strategy-modal.tsx b/frontend/public/components/modals/configure-update-strategy-modal.tsx index dc8c11cd8b7..3db66aeb6c6 100644 --- a/frontend/public/components/modals/configure-update-strategy-modal.tsx +++ b/frontend/public/components/modals/configure-update-strategy-modal.tsx @@ -15,10 +15,16 @@ import { Tooltip, } from '@patternfly/react-core'; import { useTranslation } from 'react-i18next'; - +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; import { k8sPatch, Patch, DeploymentUpdateStrategy, K8sResourceKind } from '../../module/k8s'; import { DeploymentModel } from '../../models'; -import { createModalLauncher, ModalTitle, ModalBody, ModalSubmitFooter } from '../factory/modal'; +import { + ModalTitle, + ModalBody, + ModalSubmitFooter, + ModalWrapper, + ModalComponentProps, +} from '../factory/modal'; import { usePromiseHandler } from '@console/shared/src/hooks/promise-handler'; export const getNumberOrPercent = (value) => { @@ -216,8 +222,6 @@ export const ConfigureUpdateStrategyModal = ({ ); }; -export const configureUpdateStrategyModal = createModalLauncher(ConfigureUpdateStrategyModal); - export type ConfigureUpdateStrategyProps = { showDescription?: boolean; strategyType: DeploymentUpdateStrategy['type']; @@ -232,8 +236,23 @@ export type ConfigureUpdateStrategyProps = { export type ConfigureUpdateStrategyModalProps = { deployment: K8sResourceKind; - cancel?: () => void; - close?: () => void; +} & ModalComponentProps; + +export const ConfigureUpdateStrategyModalProvider: OverlayComponent = ( + props, +) => { + return ( + + + + ); }; +// For backward compatibility with the index.ts re-export +export default ConfigureUpdateStrategyModalProvider; + ConfigureUpdateStrategy.displayName = 'ConfigureUpdateStrategy'; diff --git a/frontend/public/components/modals/delete-modal.tsx b/frontend/public/components/modals/delete-modal.tsx index 0779f965e3c..9fc95f87d86 100644 --- a/frontend/public/components/modals/delete-modal.tsx +++ b/frontend/public/components/modals/delete-modal.tsx @@ -4,7 +4,14 @@ import { useState, useCallback, useEffect } from 'react'; import { Alert, Backdrop, Checkbox, Modal, ModalVariant } from '@patternfly/react-core'; import { Trans, useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom-v5-compat'; -import { createModalLauncher, ModalTitle, ModalBody, ModalSubmitFooter } from '../factory/modal'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; +import { + ModalTitle, + ModalBody, + ModalSubmitFooter, + ModalWrapper, + ModalComponentProps, +} from '../factory/modal'; import { resourceListPathFromModel, ResourceLink } from '../utils/resource-link'; import { k8sKill, @@ -173,15 +180,22 @@ export const DeleteOverlay: FC = (props) => { ) : null; }; -export const deleteModal = createModalLauncher(DeleteModal); +export const DeleteModalProvider: OverlayComponent = (props) => { + return ( + + + + ); +}; export type DeleteModalProps = { kind: K8sModel; resource: K8sResourceKind; - close?: () => void; redirectTo?: LocationDescriptor; message?: JSX.Element; - cancel?: () => void; btnText?: ReactNode; deleteAllResources?: () => Promise; -}; +} & ModalComponentProps; + +// For backward compatibility with the index.ts re-export +export default DeleteModalProvider; diff --git a/frontend/public/components/modals/delete-pvc-modal.tsx b/frontend/public/components/modals/delete-pvc-modal.tsx index 61a0d733b70..0cb1e55d361 100644 --- a/frontend/public/components/modals/delete-pvc-modal.tsx +++ b/frontend/public/components/modals/delete-pvc-modal.tsx @@ -6,11 +6,12 @@ import { getName } from '@console/shared/src/selectors/common'; import { YellowExclamationTriangleIcon } from '@console/shared/src/components/status/icons'; import { useResolvedExtensions } from '@console/dynamic-plugin-sdk/src/api/useResolvedExtensions'; import { isPVCDelete, PVCDelete } from '@console/dynamic-plugin-sdk/src/extensions/pvc'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; import { - createModalLauncher, ModalTitle, ModalBody, ModalSubmitFooter, + ModalWrapper, ModalComponentProps, } from '../factory'; import { k8sKill, PersistentVolumeClaimKind } from '@console/internal/module/k8s'; @@ -83,4 +84,13 @@ export type DeletePVCModalProps = { pvc: PersistentVolumeClaimKind; } & ModalComponentProps; -export default createModalLauncher(DeletePVCModal); +export const DeletePVCModalProvider: OverlayComponent = (props) => { + return ( + + + + ); +}; + +// For backward compatibility with the index.ts re-export +export default DeletePVCModalProvider; diff --git a/frontend/public/components/modals/expand-pvc-modal.tsx b/frontend/public/components/modals/expand-pvc-modal.tsx index 0735da9afab..ae530db9949 100644 --- a/frontend/public/components/modals/expand-pvc-modal.tsx +++ b/frontend/public/components/modals/expand-pvc-modal.tsx @@ -1,8 +1,14 @@ import { useState, useCallback } from 'react'; import { Trans, useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom-v5-compat'; - -import { createModalLauncher, ModalTitle, ModalBody, ModalSubmitFooter } from '../factory/modal'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; +import { + ModalTitle, + ModalBody, + ModalSubmitFooter, + ModalWrapper, + ModalComponentProps, +} from '../factory/modal'; import { RequestSizeInput } from '../utils/request-size-input'; import { resourceObjPath } from '../utils/resource-link'; import { validate, convertToBaseValue, humanizeBinaryBytesWithoutB } from '../utils/units'; @@ -85,11 +91,18 @@ const ExpandPVCModal = ({ resource, kind, close, cancel }: ExpandPVCModalProps) ); }; -export const expandPVCModal = createModalLauncher(ExpandPVCModal); - export type ExpandPVCModalProps = { kind: K8sKind; resource: K8sResourceKind; - cancel?: () => void; - close: () => void; +} & ModalComponentProps; + +export const ExpandPVCModalProvider: OverlayComponent = (props) => { + return ( + + + + ); }; + +// For backward compatibility with the index.ts re-export +export default ExpandPVCModalProvider; diff --git a/frontend/public/components/modals/index.ts b/frontend/public/components/modals/index.ts index 8b887e54310..78ee7b38f86 100644 --- a/frontend/public/components/modals/index.ts +++ b/frontend/public/components/modals/index.ts @@ -1,5 +1,7 @@ // This module utilizes dynamic `import()` to enable lazy-loading for each modal instead of including them in the main bundle. +import { lazy } from 'react'; + // Helper to detect if a modal is open. This is used to disable autofocus in elements under a modal. // TODO: Improve focus and keybinding handling, see https://issues.redhat.com/browse/ODC-3554 export const isModalOpen = () => document.body.classList.contains('ReactModal__Body--open'); @@ -19,10 +21,14 @@ export const confirmModal = (props) => export const errorModal = (props) => import('./error-modal' /* webpackChunkName: "error-modal" */).then((m) => m.errorModal(props)); -export const configureNamespacePullSecretModal = (props) => +// Lazy-loaded OverlayComponent for Configure Namespace Pull Secret Modal +export const LazyConfigureNamespacePullSecretModalProvider = lazy(() => import( './configure-ns-pull-secret-modal' /* webpackChunkName: "configure-ns-pull-secret-modal" */ - ).then((m) => m.configureNamespacePullSecretModal(props)); + ).then((m) => ({ + default: m.default, + })), +); export const labelsModalLauncher = (props) => import('./labels-modal' /* webpackChunkName: "labels-modal" */).then((m) => @@ -39,16 +45,24 @@ export const rollbackModal = (props) => m.rollbackModal(props), ); -export const configureUpdateStrategyModal = (props) => +// Lazy-loaded OverlayComponent for Configure Update Strategy Modal +export const LazyConfigureUpdateStrategyModalProvider = lazy(() => import( './configure-update-strategy-modal' /* webpackChunkName: "configure-update-strategy-modal" */ - ).then((m) => m.configureUpdateStrategyModal(props)); + ).then((m) => ({ + default: m.default, + })), +); export const annotationsModalLauncher = (props) => import('./tags' /* webpackChunkName: "tags" */).then((m) => m.annotationsModalLauncher(props)); -export const deleteModal = (props) => - import('./delete-modal' /* webpackChunkName: "delete-modal" */).then((m) => m.deleteModal(props)); +// Lazy-loaded OverlayComponent for Delete Modal +export const LazyDeleteModalProvider = lazy(() => + import('./delete-modal' /* webpackChunkName: "delete-modal" */).then((m) => ({ + default: m.default, + })), +); export const clusterChannelModal = (props) => import('./cluster-channel-modal' /* webpackChunkName: "cluster-channel-modal" */).then((m) => @@ -73,20 +87,28 @@ export const tolerationsModal = (props) => m.tolerationsModal(props), ); -export const expandPVCModal = (props) => - import('./expand-pvc-modal' /* webpackChunkName: "expand-pvc-modal" */).then((m) => - m.expandPVCModal(props), - ); +// Lazy-loaded OverlayComponent for Expand PVC Modal +export const LazyExpandPVCModalProvider = lazy(() => + import('./expand-pvc-modal' /* webpackChunkName: "expand-pvc-modal" */).then((m) => ({ + default: m.default, + })), +); -export const clonePVCModal = (props) => +// Lazy-loaded OverlayComponent for Clone PVC Modal +export const LazyClonePVCModalProvider = lazy(() => import( '@console/app/src/components/modals/clone/clone-pvc-modal' /* webpackChunkName: "clone-pvc-modal" */ - ).then((m) => m.default(props)); + ).then((m) => ({ default: m.default })), +); -export const configureClusterUpstreamModal = (props) => +// Lazy-loaded OverlayComponent for Configure Cluster Upstream Modal +export const LazyConfigureClusterUpstreamModalProvider = lazy(() => import( './configure-cluster-upstream-modal' /* webpackChunkName: "configure-cluster-upstream-modal" */ - ).then((m) => m.configureClusterUpstreamModal(props)); + ).then((m) => ({ + default: m.default, + })), +); export const createAlertRoutingModal = (props) => import('./alert-routing-modal' /* webpackChunkName: "alert-routing-modal" */).then((m) => @@ -98,17 +120,18 @@ export const createColumnManagementModal = (props) => m.createColumnManagementModal(props), ); -export const removeUserModal = (props) => - import('./remove-user-modal' /* webpackChunkName: "remove-user-modal" */).then((m) => - m.removeUserModal(props), - ); - -export const restorePVCModal = (props) => +// Lazy-loaded OverlayComponent for Restore PVC Modal +export const LazyRestorePVCModalProvider = lazy(() => import( '@console/app/src/components/modals/restore-pvc/restore-pvc-modal' /* webpackChunkName: "restore-pvc-modal" */ - ).then((m) => m.default(props)); + ).then((m) => ({ default: m.default })), +); -export const managedResourceSaveModal = (props) => +// Lazy-loaded OverlayComponent for Managed Resource Save Modal +export const LazyManagedResourceSaveModalProvider = lazy(() => import( './managed-resource-save-modal' /* webpackChunkName: "managed-resource-save-modal" */ - ).then((m) => m.managedResourceSaveModal(props)); + ).then((m) => ({ + default: m.default, + })), +); diff --git a/frontend/public/components/modals/managed-resource-save-modal.tsx b/frontend/public/components/modals/managed-resource-save-modal.tsx index 29bfbb334e7..79fa6f591a1 100644 --- a/frontend/public/components/modals/managed-resource-save-modal.tsx +++ b/frontend/public/components/modals/managed-resource-save-modal.tsx @@ -1,9 +1,16 @@ import type { FC } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { createModalLauncher, ModalTitle, ModalBody, ModalSubmitFooter } from '../factory/modal'; +import { + ModalTitle, + ModalBody, + ModalSubmitFooter, + ModalComponentProps, + ModalWrapper, +} from '../factory/modal'; import { referenceForOwnerRef, K8sResourceCommon, OwnerReference } from '../../module/k8s/'; import { YellowExclamationTriangleIcon } from '@console/shared/src/components/status/icons'; +import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider'; import { ResourceLink } from '../utils/resource-link'; @@ -39,11 +46,21 @@ const ManagedResourceSaveModal: FC = (props) => { ); }; -export const managedResourceSaveModal = createModalLauncher(ManagedResourceSaveModal); +export const ManagedResourceSaveModalProvider: OverlayComponent = ( + props, +) => { + return ( + + + + ); +}; type ManagedResourceSaveModalProps = { onSubmit: () => void; - close: () => void; resource: K8sResourceCommon; owner: OwnerReference; -}; +} & ModalComponentProps; + +// For backward compatibility with the index.ts re-export +export default ManagedResourceSaveModalProvider; diff --git a/frontend/public/components/modals/remove-user-modal.tsx b/frontend/public/components/modals/remove-user-modal.tsx deleted file mode 100644 index 9532f06d9d8..00000000000 --- a/frontend/public/components/modals/remove-user-modal.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import * as _ from 'lodash'; -import type { FormEventHandler } from 'react'; -import { YellowExclamationTriangleIcon } from '@console/shared/src/components/status/icons'; - -import { GroupModel } from '../../models'; -import { GroupKind, k8sPatch } from '../../module/k8s'; -import { - ModalBody, - ModalComponentProps, - ModalSubmitFooter, - ModalTitle, - createModalLauncher, -} from '../factory/modal'; -import { useTranslation } from 'react-i18next'; -import { usePromiseHandler } from '@console/shared/src/hooks/promise-handler'; - -export const RemoveUserModal = (props: RemoveUserModalProps) => { - const [handlePromise, inProgress, errorMessage] = usePromiseHandler(); - - const submit: FormEventHandler = (e): void => { - e.preventDefault(); - const value = _.filter(props.group.users, (user: string) => user !== props.user); - const patch = [{ op: 'replace', path: '/users', value }]; - handlePromise(k8sPatch(GroupModel, props.group, patch)) - .then(() => props.close()) - .catch(() => {}); - }; - - const { t } = useTranslation(); - return ( -

- - - {t('public~Remove User from Group?')} - - - {t('public~Remove User {{ user }} from Group {{ name }}?', { - user: props.user, - name: props.group.metadata.name, - })} - - - - ); -}; - -export const removeUserModal = createModalLauncher(RemoveUserModal); - -export type RemoveUserModalProps = { - group: GroupKind; - user: string; -} & ModalComponentProps; diff --git a/frontend/public/components/namespace.jsx b/frontend/public/components/namespace.jsx index faa1ad3002b..3dfc26c39f5 100644 --- a/frontend/public/components/namespace.jsx +++ b/frontend/public/components/namespace.jsx @@ -41,6 +41,7 @@ import { DASH } from '@console/shared/src/constants/ui'; import { ByteDataTypes } from '@console/shared/src/graph-helper/data-utils'; import * as k8sActions from '@console/dynamic-plugin-sdk/src/app/k8s/actions/k8s'; import { useActivePerspective } from '@console/dynamic-plugin-sdk'; +import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay'; import PaneBody from '@console/shared/src/components/layout/PaneBody'; import { ConsoleLinkModel, @@ -71,7 +72,7 @@ import { import { navFactory } from './utils/horizontal-nav'; import { useAccessReview } from './utils/rbac'; import { Timestamp } from '@console/shared/src/components/datetime/Timestamp'; -import { configureNamespacePullSecretModal } from './modals'; +import { LazyConfigureNamespacePullSecretModalProvider } from './modals'; import { RoleBindingsPage } from './RBAC'; import { Bar } from './graphs/bar'; import { Area } from './graphs/area'; @@ -856,6 +857,7 @@ export const PullSecret = (props) => { const [error, setError] = useState(false); const { t } = useTranslation(); const { namespace, canViewSecrets } = props; + const launchModal = useOverlay(); useEffect(() => { k8sGet(ServiceAccountModel, 'default', namespace.metadata.name, {}) @@ -873,7 +875,11 @@ export const PullSecret = (props) => { }); }, [namespace.metadata.name]); - const modal = () => configureNamespacePullSecretModal({ namespace, pullSecret: undefined }); + const modal = () => + launchModal(LazyConfigureNamespacePullSecretModalProvider, { + namespace, + pullSecret: undefined, + }); const secrets = () => { if (error) { diff --git a/frontend/public/components/utils/details-page.tsx b/frontend/public/components/utils/details-page.tsx index 25377818427..e9db67b66e6 100644 --- a/frontend/public/components/utils/details-page.tsx +++ b/frontend/public/components/utils/details-page.tsx @@ -6,6 +6,7 @@ import { PencilAltIcon } from '@patternfly/react-icons/dist/esm/icons/pencil-alt import { useCanClusterUpgrade } from '@console/shared/src/hooks/useCanClusterUpgrade'; import { useAnnotationsModal } from '@console/shared/src/hooks/useAnnotationsModal'; import { useLabelsModal } from '@console/shared/src/hooks/useLabelsModal'; +import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay'; import { DetailsItem } from './details-item'; import { LabelList } from './label-list'; import { OwnerReferences } from './owner-references'; @@ -21,7 +22,7 @@ import { referenceFor, Toleration, } from '../../module/k8s'; -import { configureClusterUpstreamModal } from '../modals'; +import { LazyConfigureClusterUpstreamModalProvider } from '../modals'; import { CommonActionCreator } from '@console/app/src/actions/hooks/types'; import { useCommonActions } from '@console/app/src/actions/hooks/useCommonActions'; @@ -206,6 +207,7 @@ export const RuntimeClass: FC = ({ obj, path }) => { export const UpstreamConfigDetailsItem: FC = ({ resource }) => { const { t } = useTranslation(); const canUpgrade = useCanClusterUpgrade(); + const launchModal = useOverlay(); return (
@@ -216,7 +218,7 @@ export const UpstreamConfigDetailsItem: FC = ({ onClick={(e) => { e.preventDefault(); e.stopPropagation(); - canUpgrade && configureClusterUpstreamModal({ cv: resource }); + canUpgrade && launchModal(LazyConfigureClusterUpstreamModalProvider, { cv: resource }); }} variant="link" isDisabled={!canUpgrade} diff --git a/frontend/public/components/utils/webhooks.tsx b/frontend/public/components/utils/webhooks.tsx index 43b4045e8c4..8f9c72138c6 100644 --- a/frontend/public/components/utils/webhooks.tsx +++ b/frontend/public/components/utils/webhooks.tsx @@ -110,7 +110,9 @@ export const WebhookTriggers: FC = (props) => { setWebhookSecrets(_.compact(secrets)); setLoaded(true); }); - }, [secretNames, isLoaded, canGetSecret, namespace, launchModal]); + // missing launchModal dependency, that causes max depth exceeded error + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [secretNames, isLoaded, canGetSecret, namespace]); if (_.isEmpty(webhookTriggers)) { return null;