diff --git a/cypress/e2e/awx/overview/awx-overview.cy.ts b/cypress/e2e/awx/overview/awx-overview.cy.ts index 2d768f523f..effa3592f0 100644 --- a/cypress/e2e/awx/overview/awx-overview.cy.ts +++ b/cypress/e2e/awx/overview/awx-overview.cy.ts @@ -5,17 +5,6 @@ import { Project } from '../../../../frontend/awx/interfaces/Project'; import { awxAPI } from '../../../support/formatApiPathForAwx'; describe('AWX Overview', () => { - it('verifies the tech preview banner title in the new UI and the working links to and from the old UI', () => { - cy.navigateTo('awx', 'overview'); - cy.get('.pf-v5-c-banner') - .should( - 'contain', - 'You are currently viewing a tech preview of the new AWX user interface. To return to the original interface, click here.' - ) - .should('be.visible'); - cy.get('[data-cy="tech-preview"] a').should('contain', 'here').click(); - }); - it('clicking on Cog icon opens the Manage Dashboard modal', () => { cy.navigateTo('awx', 'overview'); cy.clickButton('Manage view'); diff --git a/framework/PageEmptyStates/PageNotImplemented.tsx b/framework/PageEmptyStates/PageNotImplemented.tsx index 5394b4770e..171e0b16bb 100644 --- a/framework/PageEmptyStates/PageNotImplemented.tsx +++ b/framework/PageEmptyStates/PageNotImplemented.tsx @@ -1,7 +1,6 @@ import { Button, EmptyState, - EmptyStateBody, EmptyStateIcon, Stack, EmptyStateActions, @@ -22,7 +21,6 @@ export function PageNotImplemented() { icon={} headingLevel="h2" /> - {t('This page is not yet available in the tech preview.')} diff --git a/frontend/awx/overview/AwxOverview.tsx b/frontend/awx/overview/AwxOverview.tsx index 6666596417..35d54f8991 100644 --- a/frontend/awx/overview/AwxOverview.tsx +++ b/frontend/awx/overview/AwxOverview.tsx @@ -1,14 +1,11 @@ /* eslint-disable i18next/no-literal-string */ -import { Banner, Bullseye, Button, PageSection, Spinner } from '@patternfly/react-core'; -import { CogIcon, InfoCircleIcon } from '@patternfly/react-icons'; -import { useEffect } from 'react'; -import { Trans, useTranslation } from 'react-i18next'; +import { Bullseye, Button, PageSection, Spinner } from '@patternfly/react-core'; +import { CogIcon } from '@patternfly/react-icons'; +import { useTranslation } from 'react-i18next'; import useSWR from 'swr'; -import { PageHeader, PageLayout, usePageDialog } from '../../../framework'; +import { PageHeader, PageLayout } from '../../../framework'; import { PageDashboard } from '../../../framework/PageDashboard/PageDashboard'; import { awxAPI } from '../common/api/awx-utils'; -import { useAwxConfig } from '../common/useAwxConfig'; -import { WelcomeModal } from './WelcomeModal'; import { AwxCountsCard } from './cards/AwxCountsCard'; import { AwxJobActivityCard } from './cards/AwxJobActivityCard'; import { AwxRecentInventoriesCard } from './cards/AwxRecentInventoriesCard'; @@ -16,17 +13,12 @@ import { AwxRecentJobsCard } from './cards/AwxRecentJobsCard'; import { AwxRecentProjectsCard } from './cards/AwxRecentProjectsCard'; import { useManagedAwxDashboard } from './hooks/useManagedAwxDashboard'; -const HIDE_WELCOME_MESSAGE = 'hide-welcome-message'; type Resource = { id: string; name: string }; export function AwxOverview() { const { t } = useTranslation(); const { openManageDashboard, managedResources } = useManagedAwxDashboard(); const product: string = process.env.PRODUCT ?? t('AWX'); - const config = useAwxConfig(); - const [_, setDialog] = usePageDialog(); - const welcomeMessageSetting = localStorage.getItem(HIDE_WELCOME_MESSAGE); - const hideWelcomeMessage = welcomeMessageSetting ? welcomeMessageSetting === 'true' : false; function renderCustomizeControls() { return ( ); } - useEffect(() => { - if (config?.ui_next && !hideWelcomeMessage) { - setDialog(); - } - }, [config?.ui_next, hideWelcomeMessage, setDialog]); return ( - {config?.ui_next && ( - -

- {' '} - - You are currently viewing a tech preview of the new {{ product }} user interface. To - return to the original interface, click here. - -

-
- )} { - setDialog(undefined); - }, [setDialog]); - const [isChecked, setIsChecked] = useState(false); - - const handleChange = (checked: boolean) => { - setIsChecked(checked); - localStorage.setItem(HIDE_WELCOME_MESSAGE, JSON.stringify(checked)); - }; - - return ( - { - onClose(); - }} - aria-label={t`Close`} - > - {t(`Close`)} - , - ]} - > - - {t( - `The new interface has been updated to provide a consistent and clean user experience. As a tech preview, not all areas within the new UI are immediately available. You can currently perform basic tasks such as create a job template and view a completed job run.` - )} - -
- - handleChange(checked)} - name="do-not-show-welcome-modal" - id="welcome-modal-checkbox" - /> - -
- ); -}