Skip to content

Commit b25b3d1

Browse files
marie-jjleveugle
authored andcommitted
fix(pci.kube): display message if no regions is available
1 parent 55cf701 commit b25b3d1

File tree

6 files changed

+31
-15
lines changed

6 files changed

+31
-15
lines changed

packages/manager/modules/pci/src/projects/project/kubernetes/add/add.routing.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
1-
import map from 'lodash/map';
2-
31
export default /* @ngInject */ ($stateProvider) => {
42
$stateProvider
53
.state('pci.projects.project.kubernetes.add', {
64
url: '/new',
75
component: 'ovhManagerPciProjectKubernetesAdd',
86
resolve: {
9-
regions: /* @ngInject */ (
10-
OvhApiCloudProjectKube,
11-
projectId,
12-
) => OvhApiCloudProjectKube.v6()
13-
.getRegions({
14-
serviceName: projectId,
15-
}).$promise
16-
.then(regions => map(regions, region => ({
17-
name: region,
18-
hasEnoughQuota: () => true,
19-
}))),
20-
217
goBack: /* @ngInject */ goToKubernetes => goToKubernetes,
228

239
breadcrumb: /* @ngInject */ $translate => $translate.instant('kubernetes_add'),

packages/manager/modules/pci/src/projects/project/kubernetes/kubernetes.routing.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,18 @@ export default /* @ngInject */ ($stateProvider) => {
4242
OvhApiCloud => OvhApiCloud.v6().schema().$promise
4343
.then(schema => get(schema, VERSION_ENUM_KEY)),
4444

45+
regions: /* @ngInject */ (
46+
OvhApiCloudProjectKube,
47+
projectId,
48+
) => OvhApiCloudProjectKube.v6()
49+
.getRegions({
50+
serviceName: projectId,
51+
}).$promise
52+
.then(regions => map(regions, region => ({
53+
name: region,
54+
hasEnoughQuota: () => true,
55+
}))),
56+
4557
breadcrumb: /* @ngInject */ $translate => $translate.instant('kube_list_title'),
4658
},
4759
});

packages/manager/modules/pci/src/projects/project/kubernetes/onboarding/onboarding.component.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ export default {
66
template,
77
bindings: {
88
addCluster: '<',
9+
regions: '<',
910
},
1011
};

packages/manager/modules/pci/src/projects/project/kubernetes/onboarding/onboarding.controller.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import isEmpty from 'lodash/isEmpty';
12
import reduce from 'lodash/reduce';
23
import illustration from './assets/kubernetes.png';
34
import { GUIDES } from './onboarding.constants';
@@ -11,6 +12,7 @@ export default class {
1112
}
1213

1314
$onInit() {
15+
this.canCreateCluster = !isEmpty(this.regions);
1416
this.illustration = illustration;
1517
this.guides = reduce(
1618
GUIDES,

packages/manager/modules/pci/src/projects/project/kubernetes/onboarding/onboarding.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,18 @@ <h1 data-translate="pci_projects_project_kubernetes_title"></h1>
44
<strong data-translate="pci_projects_project_kubernetes_onboarding_content2"></strong>
55
<p data-translate="pci_projects_project_kubernetes_onboarding_content3"></p>
66

7+
<oui-message
8+
data-ng-if="!$ctrl.canCreateCluster"
9+
data-type="warning">
10+
<p data-translate="pci_projects_project_kubernetes_onboarding_regions_unavailable"></p>
11+
<a class="oui-link"
12+
data-translate="pci_projects_project_kubernetes_onboarding_regions_create"
13+
data-ui-sref="pci.projects.new">
14+
</a>
15+
</oui-message>
16+
717
<oui-button
18+
data-ng-if="$ctrl.canCreateCluster"
819
data-variant="primary"
920
data-on-click="$ctrl.addCluster()">
1021
<span data-translate="pci_projects_project_kubernetes_onboarding_action_label"></span>

packages/manager/modules/pci/src/projects/project/kubernetes/onboarding/translations/Messages_fr_FR.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,9 @@
1616
"pci_projects_project_kubernetes_onboarding_guides_helm_title": "Installing Helm on OVH Managed Kubernetes",
1717
"pci_projects_project_kubernetes_onboarding_guides_helm_description": "",
1818
"pci_projects_project_kubernetes_onboarding_guides_istio_title": "Installing Istio on OVH Managed Kubernetes",
19-
"pci_projects_project_kubernetes_onboarding_guides_istio_description": ""
19+
"pci_projects_project_kubernetes_onboarding_guides_istio_description": "",
20+
21+
"pci_projects_project_kubernetes_onboarding_regions_unavailable": "Votre projet Public Cloud actuel est configuré dans une région dans laquelle Kubernetes n'est pas disponible. Il est nécessaire de créer un nouveau projet afin de déployer un cluster Kubernetes. Nous travaillons pour élargir l'offre Kubernetes dans d'autres régions.",
22+
"pci_projects_project_kubernetes_onboarding_regions_create": "Créer un nouveau projet Public Cloud"
23+
2024
}

0 commit comments

Comments
 (0)