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

commit:fix the front-end popup cannot exit #1957

Merged
merged 10 commits into from
May 11, 2024

Conversation

Yanshuming1
Copy link
Member

No description provided.

@Yanshuming1 Yanshuming1 marked this pull request as draft May 10, 2024 12:41
@TJxiaobao TJxiaobao self-requested a review May 10, 2024 13:34
TJxiaobao
TJxiaobao previously approved these changes May 10, 2024
Copy link
Contributor

@TJxiaobao TJxiaobao left a comment

Choose a reason for hiding this comment

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

👍👍👍

@Yanshuming1
Copy link
Member Author

@tomsun28 麻烦看下这个pr合并问题

if (account == null || account.getPassword() == null) {
return ResponseEntity.ok(Message.fail(MONITOR_LOGIN_FAILED_CODE, "Incorrect Account or Password"));
} else {
String password = loginDto.getCredential();
String password = loginDto.getCredential().trim();
Copy link
Contributor

Choose a reason for hiding this comment

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

hi, here we not suggest use the trim(), we donot need to update the username password the user input.
StringUtils.isBlank is no need, because the @Valid LoginDto has the vaild rule.

@@ -710,6 +710,9 @@ export class AlertSettingComponent implements OnInit {
onConnectModalCancel() {
this.isConnectModalVisible = false;
}
handleCancel() {
Copy link
Contributor

Choose a reason for hiding this comment

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

suggest update the method name more understand like other, eg: onExportTypeModalCancel()

Copy link
Member Author

Choose a reason for hiding this comment

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

ok

@tomsun28
Copy link
Contributor

The frontend ci error is due this, or you can run local yarn lint:fix to fix it.

Linting "hertzbeat-web-app"...

/home/runner/work/hertzbeat/hertzbeat/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts
Lint errors found in the listed files.

  714:3  error  Insert `··`  prettier/prettier

✖ 1 problem (1 error, 0 warnings)
  1 error and 0 warnings potentially fixable with the `--fix` option.

error Command failed with exit code 1.
info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
Error: Process completed with exit code 1.

@github-actions github-actions bot removed the backend label May 11, 2024
@tomsun28 tomsun28 marked this pull request as ready for review May 11, 2024 13:32
Copy link
Contributor

@tomsun28 tomsun28 left a comment

Choose a reason for hiding this comment

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

LGTM

@tomsun28 tomsun28 merged commit d343723 into apache:master May 11, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

3 participants