Skip to content

Commit c3021e2

Browse files
Cyrille Bourgoisjleveugle
Cyrille Bourgois
authored and
jleveugle
committed
fix: update containers storages
1 parent f05ea11 commit c3021e2

37 files changed

+333
-573
lines changed

‎packages/manager/modules/pci/src/projects/project/storages/cloud-archives/add/add.routing.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@ export default /* @ngInject */ ($stateProvider) => {
44
url: '/new',
55
component: 'pciProjectStorageContainersAdd',
66
resolve: {
7-
goBack: /* @ngInject */ ($rootScope, $state, projectId) => (reload = false) => {
8-
if (reload) {
9-
$rootScope.$emit('pci_storages_containers_refresh');
10-
}
11-
return $state.go('pci.projects.project.storages.archives', {
12-
projectId,
13-
});
14-
},
7+
regions: /* @ngInject */ (
8+
PciProjectStorageBlockService,
9+
projectId,
10+
) => PciProjectStorageBlockService.getAvailablesRegions(projectId),
11+
goBack: /* @ngInject */ goToStorageContainers => goToStorageContainers,
1512
cancelLink: /* @ngInject */ ($state, projectId) => $state.href('pci.projects.project.storages.archives', {
1613
projectId,
1714
}),
15+
16+
breadcrumb: /* @ngInject */ $translate => $translate
17+
.refresh()
18+
.then(() => $translate.instant('pci_projects_project_storages_containers_add_title')),
1819
},
1920
});
2021
};

‎packages/manager/modules/pci/src/projects/project/storages/cloud-archives/cloud-archive/cloud-archive.routing.js‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ export default /* @ngInject */ ($stateProvider) => {
55
component: 'pciProjectStorageContainersContainer',
66
resolve: {
77
containerId: /* @ngInject */ $transition$ => $transition$.params().containerId,
8+
container: /* @ngInject */ (
9+
PciProjectStorageContainersService,
10+
projectId,
11+
containerId,
12+
) => PciProjectStorageContainersService.getContainer(projectId, containerId),
13+
14+
defaultPassword: /* @ngInject */ (
15+
PciProjectStorageContainersService,
16+
projectId,
17+
container,
18+
) => PciProjectStorageContainersService.getArchivePassword(projectId, container),
19+
820
addObject: /* @ngInject */ ($state, projectId, containerId) => () => $state.go('pci.projects.project.storages.archives.archive.add', {
921
projectId,
1022
containerId,
@@ -14,6 +26,30 @@ export default /* @ngInject */ ($stateProvider) => {
1426
containerId,
1527
objectId: object.name,
1628
}),
29+
30+
goBack: /* @ngInject */ goToStorageContainers => goToStorageContainers,
31+
32+
goToStorageContainer: /* @ngInject */ ($rootScope, CucCloudMessage, $state, projectId, containerId) => (message = false, type = 'success') => {
33+
const reload = message && type === 'success';
34+
35+
const promise = $state.go('pci.projects.project.storages.archives.archive', {
36+
projectId,
37+
containerId,
38+
},
39+
{
40+
reload,
41+
});
42+
43+
if (message) {
44+
promise.then(() => CucCloudMessage[type](message, 'pci.projects.project.storages.containers.container'));
45+
}
46+
47+
return promise;
48+
},
49+
50+
refresh: /* @ngInject */ goToStorageContainer => goToStorageContainer,
51+
52+
breadcrumb: /* @ngInject */ container => container.name,
1753
},
1854
});
1955
};

‎packages/manager/modules/pci/src/projects/project/storages/cloud-archives/cloud-archive/delete/delete.routing.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ export default /* @ngInject */ ($stateProvider) => {
1010
layout: 'modal',
1111
resolve: {
1212
containerId: /* @ngInject */$transition$ => $transition$.params().containerId,
13-
goBack: /* @ngInject */ ($rootScope, $state, projectId) => (reload = false) => {
14-
if (reload) {
15-
$rootScope.$emit('pci_storages_containers_refresh');
16-
}
17-
return $state.go('pci.projects.project.storages.archives', {
18-
projectId,
19-
});
20-
},
13+
container: /* @ngInject */ (
14+
PciProjectStorageContainersService,
15+
projectId,
16+
containerId,
17+
) => PciProjectStorageContainersService.getContainer(projectId, containerId),
18+
goBack: /* @ngInject */ goToStorageContainers => goToStorageContainers,
2119
},
2220
});
2321
};

‎packages/manager/modules/pci/src/projects/project/storages/cloud-archives/cloud-archive/object/add/add.routing.js‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,7 @@ export default /* @ngInject */ ($stateProvider) => {
1010
layout: 'modal',
1111
resolve: {
1212
archive: () => true,
13-
goBack: /* @ngInject */ (
14-
$rootScope,
15-
$state,
16-
projectId,
17-
containerId,
18-
) => (reload = false) => {
19-
if (reload) {
20-
$rootScope.$emit('pci_storages_containers_container_refresh');
21-
}
22-
return $state.go('pci.projects.project.storages.archives.archive', {
23-
projectId,
24-
containerId,
25-
});
26-
},
13+
goBack: /* @ngInject */ goToStorageContainer => goToStorageContainer,
2714
},
2815
});
2916
};

‎packages/manager/modules/pci/src/projects/project/storages/cloud-archives/cloud-archive/object/delete/delete.routing.js‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,12 @@ export default /* @ngInject */ ($stateProvider) => {
1010
layout: 'modal',
1111
resolve: {
1212
objectId: /* @ngInject */$transition$ => $transition$.params().objectId,
13-
goBack: /* @ngInject */ (
14-
$rootScope,
15-
$state,
16-
projectId,
17-
containerId,
18-
) => (reload = false) => {
19-
if (reload) {
20-
$rootScope.$emit('pci_storages_containers_container_refresh');
21-
}
22-
return $state.go('pci.projects.project.storages.archives.archive', {
23-
projectId,
24-
containerId,
25-
});
26-
},
13+
object: /* @ngInject */ (
14+
container,
15+
objectId,
16+
) => container.getObjectById(objectId),
17+
18+
goBack: /* @ngInject */ goToStorageContainer => goToStorageContainer,
2719
},
2820
});
2921
};

‎packages/manager/modules/pci/src/projects/project/storages/cloud-archives/cloud-archives.routing.js‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ export default /* @ngInject */ ($stateProvider) => {
55
component: 'pciProjectStorageContainers',
66
resolve: {
77
archive: () => true,
8+
containers: /* @ngInject */ (
9+
PciProjectStorageContainersService,
10+
archive,
11+
projectId,
12+
) => PciProjectStorageContainersService.getAll(projectId, archive),
813
addContainer: /* @ngInject */($state, projectId) => () => $state.go('pci.projects.project.storages.archives.add', {
914
projectId,
1015
}),
@@ -16,6 +21,28 @@ export default /* @ngInject */ ($stateProvider) => {
1621
projectId,
1722
containerId: container.id,
1823
}),
24+
containerLink: /* @ngInject */($state, projectId) => container => $state.href('pci.projects.project.storages.archives.archive', {
25+
projectId,
26+
containerId: container.id,
27+
}),
28+
29+
goToStorageContainers: /* @ngInject */ ($rootScope, CucCloudMessage, $state, projectId) => (message = false, type = 'success') => {
30+
const reload = message && type === 'success';
31+
32+
const promise = $state.go('pci.projects.project.storages.archives', {
33+
projectId,
34+
},
35+
{
36+
reload,
37+
});
38+
39+
if (message) {
40+
promise.then(() => CucCloudMessage[type](message, 'pci.projects.project.storages.containers'));
41+
}
42+
43+
return promise;
44+
},
45+
1946
breadcrumb: /* @ngInject */ $translate => $translate
2047
.refresh()
2148
.then(() => $translate.instant('pci_projects_project_storages_containers_archive_title')),

‎packages/manager/modules/pci/src/projects/project/storages/containers/add/add.component.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export default {
77
bindings: {
88
projectId: '<',
99
archive: '<',
10+
regions: '<',
1011
goBack: '<',
1112
cancelLink: '<',
1213
},

‎packages/manager/modules/pci/src/projects/project/storages/containers/add/add.controller.js‎

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ export default class PciStoragesContainersAddController {
2222
}
2323

2424
$onInit() {
25+
this.loadMessages();
26+
27+
this.isLoading = false;
28+
2529
this.displaySelectedRegion = false;
2630
this.displaySelectedType = false;
2731

@@ -34,38 +38,12 @@ export default class PciStoragesContainersAddController {
3438
}),
3539
);
3640

37-
this.loadings = {
38-
regions: true,
39-
types: false,
40-
save: false,
41-
};
42-
4341
this.container = new Container({
4442
archive: this.archive,
4543
});
46-
47-
return this.$translate.refresh()
48-
.then(() => this.loadMessages())
49-
.then(() => this.PciProjectStorageBlockService.getAvailablesRegions(this.projectId))
50-
.then((regions) => {
51-
this.regions = regions;
52-
})
53-
.catch((err) => {
54-
this.CucCloudMessage.error(
55-
this.$translate.instant(
56-
'pci_projects_project_storages_containers_add_error_query',
57-
{ message: get(err, 'data.message', '') },
58-
),
59-
'pci.projects.project.storages.containers.add',
60-
);
61-
})
62-
.finally(() => {
63-
this.loadings.regions = false;
64-
});
6544
}
6645

6746
loadMessages() {
68-
this.CucCloudMessage.unSubscribe('pci.projects.project.storages.containers.add');
6947
this.messageHandler = this.CucCloudMessage.subscribe(
7048
'pci.projects.project.storages.containers.add',
7149
{
@@ -96,21 +74,15 @@ export default class PciStoragesContainersAddController {
9674
}
9775

9876
add() {
99-
this.loadings.save = true;
100-
77+
this.isLoading = true;
10178
return this.PciProjectStorageContainersService
10279
.addContainer(this.projectId, this.container)
103-
.then(() => {
104-
this.CucCloudMessage.success(
105-
this.$translate.instant(
106-
'pci_projects_project_storages_containers_add_success_message',
107-
{ container: this.container.name },
108-
),
109-
'pci.projects.project.storages.containers',
110-
);
111-
112-
return this.goBack(true);
113-
})
80+
.then(() => this.goBack(this.$translate.instant(
81+
'pci_projects_project_storages_containers_add_success_message',
82+
{
83+
container: this.container.name,
84+
},
85+
)))
11486
.catch((err) => {
11587
this.CucCloudMessage.error(
11688
this.$translate.instant(
@@ -121,7 +93,7 @@ export default class PciStoragesContainersAddController {
12193
);
12294
})
12395
.finally(() => {
124-
this.loadings.save = false;
96+
this.isLoading = false;
12597
});
12698
}
12799
}

0 commit comments

Comments
 (0)