Skip to content

Commit 552ca88

Browse files
chore: merge master into develop after 2.0.dev349 version tagging
2 parents 91110fa + c8cb7a7 commit 552ca88

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

Diff for: apps/web/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web",
3-
"version": "2.0.0-dev348",
3+
"version": "2.0.0-dev349",
44
"private": true,
55
"description": "Cloudforet Console Web Application",
66
"author": "Cloudforet",

Diff for: apps/web/src/services/asset-inventory/configurator.ts

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class AssetInventoryConfigurator implements FeatureConfiguratorType {
4949
{ id: MENU_ID.CLOUD_SERVICE, needPermissionByRole: true },
5050
{ id: MENU_ID.SERVER, needPermissionByRole: true },
5151
{ id: MENU_ID.SECURITY, needPermissionByRole: true },
52+
{ id: MENU_ID.METRIC_EXPLORER, needPermissionByRole: true },
5253
{ id: MENU_ID.COLLECTOR, needPermissionByRole: true },
5354
],
5455
},
@@ -58,6 +59,7 @@ class AssetInventoryConfigurator implements FeatureConfiguratorType {
5859
{ id: MENU_ID.CLOUD_SERVICE },
5960
{ id: MENU_ID.SERVER },
6061
{ id: MENU_ID.SECURITY },
62+
{ id: MENU_ID.METRIC_EXPLORER },
6163
{ id: MENU_ID.COLLECTOR },
6264
],
6365
},

Diff for: apps/web/src/services/cost-explorer/configurator.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ class CostExplorerConfigurator implements FeatureConfiguratorType {
5555
...baseMenu,
5656
subMenuList: [
5757
{ id: MENU_ID.COST_ANALYSIS },
58-
{ id: MENU_ID.COST_ADVANCED_SETTINGS },
5958
{ id: MENU_ID.BUDGET },
6059
{ id: MENU_ID.COST_REPORT },
6160
{ id: MENU_ID.DATA_SOURCES },
61+
{ id: MENU_ID.COST_ADVANCED_SETTINGS },
6262
],
6363
},
6464
version: this.version,

Diff for: package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cloudforet-console",
3-
"version": "2.0.0-dev348",
3+
"version": "2.0.0-dev349",
44
"private": true,
55
"workspaces": [
66
"apps/*",

0 commit comments

Comments
 (0)