-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(dedicated.pcc): fix dashboard display PCC for VCD migration
ref: MANAGER-15583 MANAGER-15584 Signed-off-by: David Arsène <[email protected]>
- Loading branch information
Showing
40 changed files
with
322 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
...manager/apps/dedicated/client/app/components/dedicated-cloud/dedicatedCloud.controller.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...s/dedicated-cloud/vmware-cloud-director/migration-banner/translations/Messages_fr_FR.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "dedicatedCloud_managed_vcd_migrated": "Votre solution Hosted Private Cloud a été migrée vers VMware Cloud Director. Cette page vous permet de gérer vos blocs d'IP publiques (commande d'un nouveau bloc, réattribution d'un bloc existant vers un autre service) qui sont actuellement attachés à votre service Hosted Private Cloud et connectés à votre service VMware Cloud Director. Cette situation est temporaire et prendra fin lorsque vos blocs d'IP publiques auront été attachés automatiquement à votre service VMware Cloud Director." | ||
| "dedicatedCloud_managed_vcd_migrated": "Votre solution Hosted Private Cloud a été migrée ou est en cours de migration vers VMware Cloud Director. Cette page vous permet de gérer vos blocs d'IP publiques (commande d'un nouveau bloc, réattribution d'un bloc existant vers un autre service) qui sont actuellement attachés à votre service Hosted Private Cloud et connectés à votre service VMware Cloud Director. Cette situation est temporaire et prendra fin lorsque vos blocs d'IP publiques auront été attachés automatiquement à votre service VMware Cloud Director." | ||
| } |
10 changes: 10 additions & 0 deletions
10
...d/client/app/dedicatedCloud/dashboard-light/associate-ip-bloc/associate-ip-bloc.module.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import angular from 'angular'; | ||
|
|
||
| import moveIpComponent from '../../../components/move-ip'; | ||
| import routing from './associate-ip-bloc.routing'; | ||
|
|
||
| const moduleName = 'ovhManagerPccDashboardLightAssociateIpBloc'; | ||
|
|
||
| angular.module(moduleName, [moveIpComponent]).config(routing); | ||
|
|
||
| export default moduleName; |
35 changes: 35 additions & 0 deletions
35
.../client/app/dedicatedCloud/dashboard-light/associate-ip-bloc/associate-ip-bloc.routing.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| export default /* @ngInject */ ($stateProvider) => { | ||
| $stateProvider.state( | ||
| 'app.dedicatedCloud.details.dashboard-light.associate-ip-bloc', | ||
| { | ||
| url: '/associate-ip-bloc', | ||
| redirectTo: (transition) => { | ||
| return transition | ||
| .injector() | ||
| .getAsync('hasVCDMigration') | ||
| .then((hasVCDMigration) => | ||
| !hasVCDMigration | ||
| ? 'app.dedicatedCloud.details.dashboard.associate-ip-bloc' | ||
| : false, | ||
| ); | ||
| }, | ||
| params: { | ||
| ips: null, | ||
| }, | ||
| views: { | ||
| modal: { | ||
| component: 'ovhManagerDedicatedMoveIp', | ||
| }, | ||
| }, | ||
| layout: 'modal', | ||
| resolve: { | ||
| ips: /* @ngInject */ (currentService) => | ||
| currentService.ips?.map(({ network }) => network), | ||
| goBack: /* @ngInject */ ($state) => () => $state.go('^'), | ||
| trackingPrefix: () => | ||
| 'dedicated::dedicatedClouds::dashboard::associate-ip-bloc', | ||
| breadcrumb: () => null, | ||
| }, | ||
| }, | ||
| ); | ||
| }; |
24 changes: 24 additions & 0 deletions
24
...nager/apps/dedicated/client/app/dedicatedCloud/dashboard-light/associate-ip-bloc/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import angular from 'angular'; | ||
| import '@uirouter/angularjs'; | ||
| import 'oclazyload'; | ||
|
|
||
| const moduleName = 'ovhManagerPccDashboardAssociateIpBlocLazyloading'; | ||
|
|
||
| angular.module(moduleName, ['oc.lazyLoad', 'ui.router']).config( | ||
| /* @ngInject */ ($stateProvider) => { | ||
| $stateProvider.state( | ||
| 'app.dedicatedCloud.details.dashboard-light.associate-ip-bloc.**', | ||
| { | ||
| url: '/associate-ip-bloc', | ||
| lazyLoad: ($transition$) => { | ||
| const $ocLazyLoad = $transition$.injector().get('$ocLazyLoad'); | ||
| return import('./associate-ip-bloc.module').then((mod) => | ||
| $ocLazyLoad.inject(mod.default || mod), | ||
| ); | ||
| }, | ||
| }, | ||
| ); | ||
| }, | ||
| ); | ||
|
|
||
| export default moduleName; |
5 changes: 4 additions & 1 deletion
5
...er/apps/dedicated/client/app/dedicatedCloud/dashboard-light/dedicatedCloudLight.module.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,13 @@ | ||
| import angular from 'angular'; | ||
|
|
||
| import dashboardLightModule from '../../components/dedicated-cloud/dashboard-light'; | ||
| import associateIpBloc from './associate-ip-bloc'; | ||
| import routing from './dedicatedCloudLight.routing'; | ||
|
|
||
| const moduleName = 'ovhManagerDedicatedCloudLightModule'; | ||
|
|
||
| angular.module(moduleName, [dashboardLightModule]).config(routing); | ||
| angular | ||
| .module(moduleName, [dashboardLightModule, associateIpBloc]) | ||
| .config(routing); | ||
|
|
||
| export default moduleName; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,16 @@ export default /* @ngInject */ ($stateProvider) => { | |
| '[email protected]': | ||
| 'ovhManagerDedicatedCloudDatacenter', | ||
| }, | ||
| redirectTo: 'app.dedicatedCloud.details.datacenter.details.dashboard', | ||
| redirectTo: (transition) => { | ||
| return transition | ||
| .injector() | ||
| .getAsync('hasVCDMigration') | ||
| .then((hasVCDMigration) => | ||
| hasVCDMigration | ||
| ? 'app.dedicatedCloud.details.dashboard-light' | ||
| : 'app.dedicatedCloud.details.datacenter.details.dashboard', | ||
| ); | ||
| }, | ||
| resolve: { | ||
| datacenterId: /* @ngInject */ ($transition$) => | ||
| $transition$.params().datacenterId, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.