Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

fix: the issue that role display name #847

Merged
merged 1 commit into from
Feb 15, 2023

Conversation

ruibaby
Copy link
Member

@ruibaby ruibaby commented Feb 10, 2023

What type of PR is this?

/kind improvement

What this PR does / why we need it:

为系统初始化的角色添加显示名称

Which issue(s) this PR fixes:

Fixes halo-dev/halo#3257

Screenshots:

image

Special notes for your reviewer:

测试方式:

  1. Halo 需要切换到:perf: refine display name of system default role halo#3280
  2. 检查 Console 端显示的系统角色是否正常。
  3. 新建若干自定义角色,检查名称是否正常。

Does this PR introduce a user-facing change?

优化 Console 端用户角色标识的显示名称。

@vercel
Copy link

vercel bot commented Feb 10, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated
ui ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Feb 10, 2023 at 6:42AM (UTC)

@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/improvement Categorizes issue or PR as related to a improvement. labels Feb 10, 2023
@ruibaby
Copy link
Member Author

ruibaby commented Feb 10, 2023

/cherrypick release-2.2

@halo-dev-bot
Copy link

@ruibaby: once the present PR merges, I will cherry-pick it on top of release-2.2 in a new PR and assign it to you.

In response to this:

/cherrypick release-2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Feb 13, 2023
@ruibaby
Copy link
Member Author

ruibaby commented Feb 13, 2023

@halo-dev/sig-halo-console

Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works very well.

/approve

@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Feb 15, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 15, 2023
@JohnNiang
Copy link
Member

/cherrypick release-2.2

@halo-dev-bot
Copy link

@JohnNiang: once the present PR merges, I will cherry-pick it on top of release-2.2 in a new PR and assign it to you.

In response to this:

/cherrypick release-2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@f2c-ci-robot f2c-ci-robot bot merged commit aca67f6 into halo-dev:main Feb 15, 2023
@halo-dev-bot
Copy link

@ruibaby: #847 failed to apply on top of branch "release-2.2":

Applying: fix: the issue that role display name
Using index info to reconstruct a base tree...
M	src/layouts/BasicLayout.vue
Falling back to patching base and 3-way merge...
Auto-merging src/layouts/BasicLayout.vue
CONFLICT (content): Merge conflict in src/layouts/BasicLayout.vue
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: the issue that role display name
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ruibaby ruibaby added this to the 2.3.x milestone Feb 15, 2023
@ruibaby
Copy link
Member Author

ruibaby commented Feb 15, 2023

/cherrypick release-2.2

@ruibaby ruibaby deleted the fix/role-display-name branch February 15, 2023 06:00
@halo-dev-bot
Copy link

@ruibaby: #847 failed to apply on top of branch "release-2.2":

Applying: fix: the issue that role display name
Using index info to reconstruct a base tree...
M	src/layouts/BasicLayout.vue
Falling back to patching base and 3-way merge...
Auto-merging src/layouts/BasicLayout.vue
CONFLICT (content): Merge conflict in src/layouts/BasicLayout.vue
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: the issue that role display name
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ruibaby
Copy link
Member Author

ruibaby commented Feb 15, 2023

/cherrypick release-2.2

@halo-dev-bot
Copy link

@ruibaby: new pull request created: #856

In response to this:

/cherrypick release-2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

f2c-ci-robot bot pushed a commit that referenced this pull request Feb 15, 2023
This is an automated cherry-pick of #847

/assign ruibaby

```release-note
优化 Console 端用户角色标识的显示名称。
```
@ruibaby ruibaby modified the milestones: 2.3.x, 2.3.0 Feb 21, 2023
f2c-ci-robot bot pushed a commit that referenced this pull request Feb 24, 2023
#### What type of PR is this?

/kind improvement

#### What this PR does / why we need it:

重构获取用户信息的请求方式,无需再请求所有角色即可获取当前用户的角色信息,适配:halo-dev/halo#3372

相关 PR:#847

#### Which issue(s) this PR fixes:

Fixes halo-dev/halo#3342

#### Special notes for your reviewer:

测试方式:

1. Halo 需要切换到 halo-dev/halo#3372 分支。
2. Console 需要 `pnpm install && pnpm build:packages`
3. 测试用户列表、登录、检查角色信息是否显示正确。

#### Does this PR introduce a user-facing change?

```release-note
优化 Console 端用户角色标识的显示名称。
```
JohnNiang pushed a commit to JohnNiang/halo that referenced this pull request Mar 2, 2023
#### What type of PR is this?

/kind improvement

#### What this PR does / why we need it:

为系统初始化的角色添加显示名称

#### Which issue(s) this PR fixes:

Fixes halo-dev#3257

#### Screenshots:

<img width="1668" alt="image" src="https://user-images.githubusercontent.com/21301288/218020794-696420c4-69bb-4422-9409-482bb2aff708.png">


#### Special notes for your reviewer:

测试方式:

1. Halo 需要切换到:halo-dev#3280
2. 检查 Console 端显示的系统角色是否正常。
3. 新建若干自定义角色,检查名称是否正常。

#### Does this PR introduce a user-facing change?

```release-note
优化 Console 端用户角色标识的显示名称。
```
JohnNiang pushed a commit to JohnNiang/halo that referenced this pull request Mar 2, 2023
#### What type of PR is this?

/kind improvement

#### What this PR does / why we need it:

重构获取用户信息的请求方式,无需再请求所有角色即可获取当前用户的角色信息,适配:halo-dev#3372

相关 PR:halo-dev/console#847

#### Which issue(s) this PR fixes:

Fixes halo-dev#3342

#### Special notes for your reviewer:

测试方式:

1. Halo 需要切换到 halo-dev#3372 分支。
2. Console 需要 `pnpm install && pnpm build:packages`
3. 测试用户列表、登录、检查角色信息是否显示正确。

#### Does this PR introduce a user-facing change?

```release-note
优化 Console 端用户角色标识的显示名称。
```
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/improvement Categorizes issue or PR as related to a improvement. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

用户角色标识无法正常显示角色名称
4 participants