Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust navigation menu #149

Merged
merged 12 commits into from
Jun 3, 2024
Merged

Adjust navigation menu #149

merged 12 commits into from
Jun 3, 2024

Conversation

SLSJL
Copy link
Contributor

@SLSJL SLSJL commented Jun 3, 2024

Fixes Adjust navigation menu

Motivation

*Adjust navigation menu

SUN and others added 12 commits March 7, 2024 00:37
…to dev

* 'dev' of https://github.com/SLSJL/eventmesh-dashboard:
  [ISSUE apache#73] Add remoting service (apache#74)
  [ISSUE apache#45] Implement methods from storage-plugin.admin(rocketmq) (apache#66)
  [ISSUE apache#71] Reduce log file size and Streamline debug output (apache#72)
  [ISSUE apache#69] Integrate database credentials in auto-deploy (apache#70)
  [ISSUE apache#67] Fix HealthCheckResultMapper which leads to application error
  [ISSUE apache#64] Support automated deployment and Fix runtime packaging errors (apache#65)
  [ISSUE apache#60] add SDK manager (apache#62)
  [ISSUE apache#57] Modify the field, synchronize the modification, and add the mapper method (apache#58)
  [ISSUE apache#29] Set up EventMesh Dashboard Front-end (apache#56)
  [ISSUE apache#49] RocketMQ and Nacos health check (apache#53)
  [ISSUE apache#51] Config Mgmt basic function and config,runtime,store,cluster SQL (apache#52)

# Conflicts:
#	eventmesh-dashboard-view/public/index.html
#	eventmesh-dashboard-view/src/App.tsx
#	eventmesh-dashboard-view/src/index.tsx
#	eventmesh-dashboard-view/src/routes/RootLayout.tsx
#	eventmesh-dashboard-view/src/routes/navigation/Navigation.tsx
#	eventmesh-dashboard-view/src/routes/navigation/NavigationItem.tsx
#	eventmesh-dashboard-view/src/routes/topic/Topic.tsx
#	eventmesh-dashboard-view/src/routes/topic/stats/AbnormalTopicCount.tsx
#	eventmesh-dashboard-view/src/routes/topic/stats/Stats.tsx
#	eventmesh-dashboard-view/src/routes/topic/stats/StatsChart.tsx
#	eventmesh-dashboard-view/src/routes/topic/stats/TopicCount.tsx
#	eventmesh-dashboard-view/src/routes/topic/topic-list/TopicList.tsx
2. optimized the layout
* main: (32 commits)
  [ISSUE apache#144] Auto approve when dependabot's branch is changed by someone else (apache#145)
  chore(deps): bump gradle/gradle-build-action from 2 to 3 (apache#140)
  chore(deps): bump actions/setup-java from 3 to 4 (apache#139)
  [ISSUE apache#134] Deploy Meta, Event Store and Runtime test environments in CI (apache#135)
  [ISSUE apache#63] Function Manager and Health Service update (apache#98)
  chore(deps): bump org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0 (apache#124)
  chore(deps): bump com.alibaba.fastjson2:fastjson2 from 2.0.40 to 2.0.49 (apache#125)
  chore(deps): bump org.springdoc:springdoc-openapi-ui from 1.7.0 to 1.8.0 (apache#127)
  [ISSUE apache#132] Make Maven Wrapper executable (apache#133)
  [ISSUE apache#130] Auto-approve Dependabot PR only and Disable PR up-to-date check (apache#131)
  [ISSUE apache#128] Use GitHub CLI `comment` to auto-merge a Dependabot PR (apache#129)
  [ISSUE apache#122] Enable auto-merge workflow of Dependabot (apache#123)
  chore(deps): bump webpack-dev-middleware in /eventmesh-dashboard-view (apache#117)
  Add SDKManager JavaDoc and some code optimisation (apache#121)
  [ISSUE apache#119] Introduce dependencies for a unified return front-end format (apache#120)
  chore(deps): bump spring-boot.version from 2.7.6 to 2.7.18 (apache#112)
  chore(deps): bump org.apache.rocketmq:rocketmq-client (apache#115)
  chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin (apache#111)
  chore(deps): bump org.apache.maven.plugins:maven-compiler-plugin (apache#114)
  chore(deps): bump io.etcd:jetcd-core from 0.7.5 to 0.7.7 (apache#113)
  ...

# Conflicts:
#	eventmesh-dashboard-view/src/assets/icons/index.ts
#	eventmesh-dashboard-view/src/routes/RootLayout.tsx
#	eventmesh-dashboard-view/src/routes/cluster/topic/Topic.tsx
#	eventmesh-dashboard-view/src/routes/cluster/topic/stats/Stats.tsx
#	eventmesh-dashboard-view/src/routes/cluster/topic/stats/TopicCount.tsx
#	eventmesh-dashboard-view/src/routes/navigation/Navigation.tsx
#	eventmesh-dashboard-view/src/routes/topic/topic-list/TopicList.tsx
@SLSJL SLSJL requested a review from Pil0tXia June 3, 2024 14:05
@Pil0tXia Pil0tXia merged commit 32fdc70 into apache:main Jun 3, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants