diff --git a/packages/manager/apps/dedicated/client/app/dedicated/dedicated-server/clusters/nodes/node/dashboard/dashboard.routing.js b/packages/manager/apps/dedicated/client/app/dedicated/dedicated-server/clusters/nodes/node/dashboard/dashboard.routing.js index b0f03803a11e..67d095505e69 100644 --- a/packages/manager/apps/dedicated/client/app/dedicated/dedicated-server/clusters/nodes/node/dashboard/dashboard.routing.js +++ b/packages/manager/apps/dedicated/client/app/dedicated/dedicated-server/clusters/nodes/node/dashboard/dashboard.routing.js @@ -361,15 +361,21 @@ export default /* @ngInject */ ($stateProvider) => { ? $http .get(`/dedicated/server/${serverName}/task/${taskIds[0]}`) .then(({ data: task }) => { - return (task.plannedInterventionId + const usePlannedChange = !!( + task.changeUuid && task.changeUuid !== null + ); + const route = usePlannedChange + ? 'plannedChange' + : 'plannedIntervention'; + const linkageId = usePlannedChange + ? task.changeUuid + : task.plannedInterventionId; + return (linkageId ? $http .get( - `/dedicated/server/${serverName}/plannedIntervention/${task.plannedInterventionId}`, - ) - .then( - ({ data: plannedIntervention }) => - plannedIntervention, + `/dedicated/server/${serverName}/${route}/${linkageId}`, ) + .then(({ data }) => data) : $q.when(null) ).then((plannedIntervention) => { return new UpgradeTask({ diff --git a/packages/manager/apps/dedicated/client/app/dedicated/dedicated-server/servers/server/dashboard/dashboard.routing.js b/packages/manager/apps/dedicated/client/app/dedicated/dedicated-server/servers/server/dashboard/dashboard.routing.js index fbbdece0bc9e..66d9c0d13550 100644 --- a/packages/manager/apps/dedicated/client/app/dedicated/dedicated-server/servers/server/dashboard/dashboard.routing.js +++ b/packages/manager/apps/dedicated/client/app/dedicated/dedicated-server/servers/server/dashboard/dashboard.routing.js @@ -340,15 +340,21 @@ export default /* @ngInject */ ($stateProvider) => { ? $http .get(`/dedicated/server/${serverName}/task/${taskIds[0]}`) .then(({ data: task }) => { - return (task.plannedInterventionId + const usePlannedChange = !!( + task.changeUuid && task.changeUuid !== null + ); + const route = usePlannedChange + ? 'plannedChange' + : 'plannedIntervention'; + const linkageId = usePlannedChange + ? task.changeUuid + : task.plannedInterventionId; + return (linkageId ? $http .get( - `/dedicated/server/${serverName}/plannedIntervention/${task.plannedInterventionId}`, - ) - .then( - ({ data: plannedIntervention }) => - plannedIntervention, + `/dedicated/server/${serverName}/${route}/${linkageId}`, ) + .then(({ data }) => data) : $q.when(null) ).then((plannedIntervention) => { return new UpgradeTask({