Skip to content

Commit 75c5cef

Browse files
marie-jjleveugle
authored andcommitted
fix(vrack): fix moving product out of vrack
ref: OM-356
1 parent a817e42 commit 75c5cef

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

packages/manager/apps/vrack/index.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
import 'script-loader!jquery'; // eslint-disable-line
2-
import 'script-loader!lodash'; // eslint-disable-line
1+
/* eslint-disable import/no-webpack-loader-syntax, import/extensions */
2+
3+
import 'script-loader!jquery';
4+
import 'script-loader!lodash';
5+
import 'script-loader!messenger/build/js/messenger.js';
6+
import 'script-loader!messenger/build/js/messenger-theme-future.js';
7+
import 'script-loader!messenger/build/js/messenger-theme-flat.js';
8+
9+
/* eslint-enable import/no-webpack-loader-syntax, import/extensions */
310

411
import angular from 'angular';
512
import ovhManagerVrack from '@ovh-ux/manager-vrack';

packages/manager/apps/vrack/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"@ovh-ux/ng-ovh-cloud-universe-components": "^1.1.0-alpha.0",
2020
"@ovh-ux/ng-ovh-contracts": "^3.0.0-beta.3",
2121
"@ovh-ux/ng-ovh-proxy-request": "^1.0.0-beta.0",
22+
"@ovh-ux/ng-ovh-toaster": "^1.0.2",
2223
"@ovh-ux/ng-ovh-user-pref": "^1.0.0",
2324
"@ovh-ux/ng-translate-async-loader": "^2.0.0",
2425
"@uirouter/angularjs": "^1.0.22",
@@ -28,6 +29,7 @@
2829
"d3": "~3.5.13",
2930
"jquery": "^2.1.3",
3031
"lodash": "^3.10.1",
32+
"messenger": "HubSpot/messenger#~1.4.1",
3133
"oclazyload": "^1.1.0",
3234
"ovh-api-services": "^6.8.0",
3335
"ovh-manager-webfont": "^1.1.0",

packages/manager/modules/vrack/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"@ovh-ux/manager-core": "^5.0.0",
4444
"@ovh-ux/ng-ovh-cloud-universe-components": "^1.0.1-alpha.0",
4545
"@ovh-ux/ng-ovh-contracts": "^3.0.0-beta.3",
46+
"@ovh-ux/ng-ovh-toaster": "^1.0.2",
4647
"@uirouter/angularjs": "^1.0.15",
4748
"angular": "^1.7.5",
4849
"angular-ui-bootstrap": "~1.3.3",

packages/manager/modules/vrack/src/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import '@ovh-ux/ng-ovh-cloud-universe-components';
88
import 'ovh-ui-kit/dist/oui.css';
99
import 'ovh-manager-webfont/dist/css/ovh-font.css';
1010
import '@ovh-ux/manager-cloud-styles';
11+
import '@ovh-ux/ng-ovh-toaster';
12+
1113

1214
import vrackAdd from './add';
1315

@@ -19,6 +21,7 @@ angular.module(moduleName, [
1921
'oc.lazyLoad',
2022
'ovhManagerCore',
2123
'ngOvhCloudUniverseComponents',
24+
'ngOvhToaster',
2225
vrackAdd,
2326
]).config(/* @ngInject */($stateProvider) => {
2427
$stateProvider.state('vrack.**', {

packages/manager/modules/vrack/src/vrack.controller.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import keys from 'lodash/keys';
2323

2424
import angular from 'angular';
2525

26-
import selectVrackCtrl from './modals/selectVrack.controller';
27-
import selectVrackTpl from './modals/selectVrack.html';
26+
import moveDialogCtrl from './move-dialog/vrack-move-dialog.controller';
27+
import moveDialogTpl from './move-dialog/vrack-move-dialog.html';
2828
import constant from './vrack.constant';
2929
import arrowIcon from '../assets/icon_vrack-mapper-arrows.svg';
3030

@@ -650,8 +650,8 @@ export default /* @ngInject */ function VrackCtrl($scope, $q, $stateParams,
650650
self.moveSelectedService = function moveSelectedService() {
651651
self.modals.move = $uibModal.open({
652652
windowTopClass: 'cui-modal',
653-
template: selectVrackTpl,
654-
controller: selectVrackCtrl,
653+
template: moveDialogTpl,
654+
controller: moveDialogCtrl,
655655
controllerAs: 'ctrl',
656656
resolve: {
657657
service() {

0 commit comments

Comments
 (0)