Skip to content

Commit c42edd0

Browse files
Merge pull request #11307 from nikhagra-akamai/tech-docs-url
upcoming: [DI-22040] - Updated tech docs & ACLP path url
2 parents f2653ad + f8402e0 commit c42edd0

File tree

10 files changed

+15
-25
lines changed

10 files changed

+15
-25
lines changed

packages/manager/cypress/e2e/core/cloudpulse/cloudpulse-navigation.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('CloudPulse navigation', () => {
3030
cy.wait('@getFeatureFlags');
3131

3232
cy.get('[data-testid="menu-item-Monitor"]').should('be.visible').click();
33-
cy.url().should('endWith', '/cloudpulse');
33+
cy.url().should('endWith', '/monitor');
3434
});
3535

3636
/*
@@ -63,7 +63,7 @@ describe('CloudPulse navigation', () => {
6363
},
6464
}).as('getFeatureFlags');
6565

66-
cy.visitWithLogin('monitor/cloudpulse');
66+
cy.visitWithLogin('monitor');
6767
cy.wait('@getFeatureFlags');
6868

6969
cy.findByText('Not Found').should('be.visible');

packages/manager/cypress/e2e/core/cloudpulse/dbaas-widgets-verification.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ describe('Integration Tests for DBaaS Dashboard ', () => {
182182
mockGetDatabases([databaseMock]).as('getDatabases');
183183

184184
// navigate to the cloudpulse page
185-
cy.visitWithLogin('monitor/cloudpulse');
185+
cy.visitWithLogin('monitor');
186186

187187
// Wait for the services and dashboard API calls to complete before proceeding
188188
cy.wait(['@fetchServices', '@fetchDashboard']);

packages/manager/cypress/e2e/core/cloudpulse/linode-widget-verification.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ describe('Integration Tests for Linode Dashboard ', () => {
161161
mockGetUserPreferences({});
162162

163163
// navigate to the cloudpulse page
164-
cy.visitWithLogin('monitor/cloudpulse');
164+
cy.visitWithLogin('monitor');
165165

166166
// Wait for the services and dashboard API calls to complete before proceeding
167167
cy.wait(['@fetchServices', '@fetchDashboard']);

packages/manager/src/MainContent.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,7 @@ export const MainContent = () => {
357357
)}
358358
<Route component={VPC} path="/vpcs" />
359359
{isACLPEnabled && (
360-
<Route
361-
component={CloudPulse}
362-
path="/monitor/cloudpulse"
363-
/>
360+
<Route component={CloudPulse} path="/monitor" />
364361
)}
365362
<Redirect exact from="/" to={defaultRoot} />
366363
{/** We don't want to break any bookmarks. This can probably be removed eventually. */}

packages/manager/src/components/PrimaryNav/PrimaryNav.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
196196
{
197197
display: 'Monitor',
198198
hide: !isACLPEnabled,
199-
href: '/monitor/cloudpulse',
199+
href: '/monitor',
200200
isBeta: flags.aclp?.beta,
201201
},
202202
],

packages/manager/src/features/CloudPulse/Alerts/AlertsLanding/AlertsDefinitionLanding.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const AlertDefinitionLanding = () => {
1010
<Route
1111
component={AlertDefinition}
1212
exact
13-
path="/monitor/cloudpulse/alerts/definitions"
13+
path="/monitor/alerts/definitions"
1414
/>
1515
<Route
1616
component={() => <CreateAlertDefinition />}

packages/manager/src/features/CloudPulse/Alerts/AlertsLanding/AlertsLanding.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,10 @@ export const AlertsLanding = React.memo(() => {
8484
<Switch>
8585
<Route
8686
component={AlertDefinitionLanding}
87-
path={'/monitor/cloudpulse/alerts/definitions'}
88-
/>
89-
<Redirect
90-
from="/monitor/cloudpulse/alerts"
91-
to="/monitor/cloudpulse/alerts/definitions"
87+
exact
88+
path={'/monitor/alerts/definitions'}
9289
/>
90+
<Redirect from="*" to="/monitor/alerts/definitions" />
9391
</Switch>
9492
</Tabs>
9593
</Paper>

packages/manager/src/features/CloudPulse/CloudPulseLanding.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const CloudPulseLanding = () => {
1212
<LandingHeader
1313
breadcrumbProps={{ pathname: '/Akamai Cloud Pulse' }}
1414
docsLabel="Docs"
15-
docsLink="https://www.linode.com/docs/"
15+
docsLink="https://techdocs.akamai.com/cloud-computing/docs/akamai-cloud-pulse"
1616
/>
1717
<React.Suspense fallback={<SuspenseLoader />}>
1818
<Switch>
@@ -23,8 +23,6 @@ export const CloudPulseLanding = () => {
2323
);
2424
};
2525

26-
export const cloudPulseLandingLazyRoute = createLazyRoute(
27-
'/monitor/cloudpulse'
28-
)({
26+
export const cloudPulseLandingLazyRoute = createLazyRoute('/monitor')({
2927
component: CloudPulseLanding,
3028
});

packages/manager/src/features/CloudPulse/CloudPulseTabs.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,11 @@ export const CloudPulseTabs = () => {
7676
<Switch>
7777
<Route
7878
component={CloudPulseDashboardLanding}
79+
exact
7980
path={`${url}/dashboards`}
8081
/>
8182
<Route component={AlertsLanding} path={`${url}/alerts`} />
82-
<Redirect
83-
exact
84-
from="/monitor/cloudpulse"
85-
to="/monitor/cloudpulse/dashboards"
86-
/>
83+
<Redirect from="*" to="/monitor/dashboards" />
8784
</Switch>
8885
</React.Suspense>
8986
</Tabs>

packages/manager/src/routes/cloudPulse/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { CloudPulseRoute } from './CloudPulseRoute';
66
const cloudPulseRoute = createRoute({
77
component: CloudPulseRoute,
88
getParentRoute: () => rootRoute,
9-
path: 'monitor/cloudpulse',
9+
path: 'monitor',
1010
});
1111

1212
const cloudPulseLandingRoute = createRoute({

0 commit comments

Comments
 (0)