Skip to content

Commit d96d5da

Browse files
author
jleveugle
committed
feat(sidebar): avoid use same state each time
1 parent 26b25f7 commit d96d5da

File tree

7 files changed

+68
-19
lines changed

7 files changed

+68
-19
lines changed

packages/manager/apps/public-cloud/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"start:watch": "lerna exec --stream --parallel --scope='@ovh-ux/manager-public-cloud' --include-filtered-dependencies -- yarn run dev:watch"
1414
},
1515
"dependencies": {
16-
"@ovh-ux/ng-ovh-uirouter-layout": "^0.0.0",
1716
"@fortawesome/fontawesome-free": "^5.8.1",
1817
"@ovh-ux/manager-cloud-styles": "^0.3.0-alpha.0",
1918
"@ovh-ux/manager-config": "^0.2.0",
@@ -32,6 +31,7 @@
3231
"@ovh-ux/ng-ovh-sidebar-menu": "git+https://github.com/ovh-ux/ng-ovh-sidebar-menu.git#feat/always-open",
3332
"@ovh-ux/ng-ovh-swimming-poll": "^4.0.0",
3433
"@ovh-ux/ng-ovh-toaster": "^1.0.2",
34+
"@ovh-ux/ng-ovh-uirouter-layout": "^0.0.0",
3535
"@ovh-ux/ng-ovh-user-pref": "^1.0.0",
3636
"@ovh-ux/ng-translate-async-loader": "^2.0.0",
3737
"@uirouter/angularjs": "^1.0.20",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export default /* @ngInject */ ($urlRouterProvider) => {
2-
$urlRouterProvider.otherwise('/');
2+
$urlRouterProvider.otherwise('/#!/pci/projects');
33
};

packages/manager/apps/public-cloud/src/sidebar/sidebar.constant.js

Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@ export const MENU = [
2020
},
2121
{
2222
options: {
23-
state: 'pci.projects.project',
23+
state: 'pci.projects.project2',
2424
},
2525
translation: 'cloud_sidebar_storage_object_storage',
2626
},
2727
{
2828
options: {
29-
state: 'pci.projects.project',
29+
state: 'pci.projects.project2',
3030
},
3131
translation: 'cloud_sidebar_storage_cold_storage',
3232
},
3333
{
3434
options: {
35-
state: 'pci.projects.project',
35+
state: 'pci.projects.project2',
3636
},
3737
translation: 'cloud_sidebar_storage_volume_storage',
3838
},
3939
{
4040
options: {
41-
state: 'pci.projects.project',
41+
state: 'pci.projects.project2',
4242
},
4343
translation: 'cloud_sidebar_storage_instance_storage',
4444
},
@@ -49,10 +49,16 @@ export const MENU = [
4949
subitems: [
5050
{
5151
options: {
52-
state: 'pci.projects.project',
52+
state: 'pci.projects.project2',
5353
},
5454
translation: 'cloud_sidebar_private_network',
5555
},
56+
{
57+
options: {
58+
state: 'pci.projects.project2',
59+
},
60+
translation: 'cloud_sidebar_failover_ip',
61+
},
5662
],
5763
translation: 'cloud_sidebar_network',
5864
},
@@ -64,17 +70,48 @@ export const MENU = [
6470
},
6571
translation: 'cloud_sidebar_orchestration_kubernetes',
6672
},
73+
{
74+
options: {
75+
state: 'pci.projects.project2',
76+
},
77+
translation: 'cloud_sidebar_orchestration_private_registry',
78+
},
79+
{
80+
options: {
81+
state: 'pci.projects.project2',
82+
},
83+
translation: 'cloud_sidebar_orchestration_image_catalog',
84+
},
6785
],
6886
translation: 'cloud_sidebar_orchestration',
6987
},
7088
{
7189
translation: 'cloud_sidebar_data_analytics',
90+
subitems: [
91+
{
92+
options: {
93+
state: 'pci.projects.project2',
94+
},
95+
translation: 'cloud_sidebar_data_analytics_adp',
96+
},
97+
],
7298
},
7399
{
74100
translation: 'cloud_sidebar_management_interface',
75-
},
76-
{
77-
translation: 'cloud_sidebar_marketplace',
101+
subitems: [
102+
{
103+
options: {
104+
state: 'pci.projects.project2',
105+
},
106+
translation: 'cloud_sidebar_management_interface_horizon',
107+
},
108+
{
109+
options: {
110+
state: 'pci.projects.project2',
111+
},
112+
translation: 'cloud_sidebar_management_interface_cloud_shell',
113+
},
114+
],
78115
},
79116
{
80117
options: {

packages/manager/apps/public-cloud/src/sidebar/sidebar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="h-100 d-flex flex-column">
2-
<div class="px-3 py-4 w-100">
2+
<div class="p-3 w-100">
33
<div data-ng-if="$ctrl.isLoading">
44
<oui-skeleton size="xs"></oui-skeleton>
55
<oui-skeleton class="mt-2" size="s"></oui-skeleton>

packages/manager/apps/public-cloud/src/sidebar/translations/Messages_fr_FR.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
{
22
"cloud_sidebar_compute": "Compute",
3-
"cloud_sidebar_compute_instance": "Instance",
3+
"cloud_sidebar_compute_instance": "Instances",
44
"cloud_sidebar_storage": "Storage",
55
"cloud_sidebar_storage_block_storage": "Block Storage",
66
"cloud_sidebar_storage_object_storage": "Object Storage",
7-
"cloud_sidebar_storage_cold_storage": "Cold Storage",
8-
"cloud_sidebar_storage_volume_storage": "Volume Storage",
9-
"cloud_sidebar_storage_instance_storage": "Instance Storage",
7+
"cloud_sidebar_storage_cold_storage": "Cloud Archive",
8+
"cloud_sidebar_storage_volume_storage": "Volume Snapshot",
9+
"cloud_sidebar_storage_instance_storage": "Instance Backup",
1010
"cloud_sidebar_network": "Réseaux",
1111
"cloud_sidebar_private_network": "Réseaux privés",
12+
"cloud_sidebar_failover_ip": "Failover IP",
1213
"cloud_sidebar_orchestration": "Orchestration / Industrialization",
13-
"cloud_sidebar_orchestration_kubernetes": "Kubernetes",
14+
"cloud_sidebar_orchestration_kubernetes": "Managed Kubernetes",
15+
"cloud_sidebar_orchestration_private_registry": "Managed Private Registry",
16+
"cloud_sidebar_orchestration_image_catalog": "Managed Image Catalog",
17+
"cloud_sidebar_data_analytics_adp": "Analytics Data Platform",
1418
"cloud_sidebar_data_analytics": "Data & Analytics",
1519
"cloud_sidebar_management_interface": "Management Interfaces",
16-
"cloud_sidebar_marketplace": "Marketplace",
20+
"cloud_sidebar_management_interface_horizon": "Horizon",
21+
"cloud_sidebar_management_interface_cloud_shell": "Cloud Shell",
1722
"cloud_sidebar_project_management": "Project management",
1823
"cloud_sidebar_project_management_users": "Utilisateurs",
1924
"cloud_sidebar_project_management_quota_region": "Quota & Région",

packages/manager/modules/pci/src/projects/project/storages/blocks/blocks.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<section data-ui-view>
1+
<section class="p-5" data-ui-view>
22
<h1>Block Storage</h1>
33

44
<cui-message-container data-messages="$ctrl.messages"></cui-message-container>

yarn.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1755,7 +1755,7 @@
17551755

17561756
"@ovh-ux/ng-ovh-sidebar-menu@git+https://github.com/ovh-ux/ng-ovh-sidebar-menu.git#feat/always-open":
17571757
version "8.0.0-beta.1"
1758-
resolved "git+https://github.com/ovh-ux/ng-ovh-sidebar-menu.git#cb4ede31ce4953edd6968534c6098a0b1f9ac334"
1758+
resolved "git+https://github.com/ovh-ux/ng-ovh-sidebar-menu.git#76db3c9cda614bb35a2c4a85e34f1068528bfd1e"
17591759

17601760
"@ovh-ux/ng-ovh-sso-auth@^4.0.0-beta.0":
17611761
version "4.0.0"
@@ -9454,6 +9454,13 @@ ovh-api-services@^6.15.0:
94549454
dependencies:
94559455
lodash "^3.10.1"
94569456

9457+
ovh-api-services@^6.4.0:
9458+
version "6.7.0"
9459+
resolved "https://registry.yarnpkg.com/ovh-api-services/-/ovh-api-services-6.7.0.tgz#b65fa6c22e2d4e37100f5747e57f96d929cee446"
9460+
integrity sha512-r7LBjFBIJvpPQrI+r95nUsW57wGfLt+b9yhnLRE6/iuC5ga0g+0CJuIuD7m5U5vjMbfL+EyyQkF/MsKSVn2fAA==
9461+
dependencies:
9462+
lodash "^3.10.1"
9463+
94579464
ovh-common-style@^3.2.2:
94589465
version "3.2.2"
94599466
resolved "https://registry.yarnpkg.com/ovh-common-style/-/ovh-common-style-3.2.2.tgz#66f4637c7393d1bd5118b05b63b034f26120a41f"

0 commit comments

Comments
 (0)