Skip to content

Commit

Permalink
chore: merge master into develop after 2.0.dev310 version tagging
Browse files Browse the repository at this point in the history
  • Loading branch information
admin-cloudforet committed Feb 7, 2025
2 parents 76c3c03 + 7f74e7c commit f5f3da4
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 5 deletions.
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web",
"version": "2.0.0-dev309",
"version": "2.0.0-dev310",
"private": true,
"description": "Cloudforet Console Web Application",
"author": "Cloudforet",
Expand Down
14 changes: 14 additions & 0 deletions apps/web/src/lib/menu/menu-architecture.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,14 @@ export const MENU_LIST_FOR_ALERT_MANAGER_V2: Menu[] = [
{ id: MENU_ID.ALERTS, needPermissionByRole: true },
],
},
{
id: MENU_ID.OPS_FLOW,
needPermissionByRole: true,
subMenuList: [
{ id: MENU_ID.OPS_FLOW_LANDING },
{ id: MENU_ID.TASK_BOARD },
],
},
{
id: MENU_ID.IAM,
needPermissionByRole: true,
Expand Down Expand Up @@ -224,6 +232,12 @@ export const ADMIN_MENU_LIST_FOR_ALERT_MANAGER_V2: Menu[] = [
{ id: MENU_ID.COST_ADVANCED_SETTINGS },
],
},
{
id: MENU_ID.OPS_FLOW,
subMenuList: [
{ id: MENU_ID.TASK_MANAGEMENT },
],
},
{
id: MENU_ID.IAM,
subMenuList: [
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cloudforet-console",
"version": "2.0.0-dev309",
"version": "2.0.0-dev310",
"private": true,
"workspaces": [
"apps/*",
Expand Down

0 comments on commit f5f3da4

Please sign in to comment.