Skip to content

Feature add user state#2710

Merged
davidzollo merged 22 commits intoapache:devfrom
wen-hemin:feature-addUserState
Jul 15, 2020
Merged

Feature add user state#2710
davidzollo merged 22 commits intoapache:devfrom
wen-hemin:feature-addUserState

Conversation

@wen-hemin
Copy link
Copy Markdown
Contributor

@wen-hemin wen-hemin commented May 14, 2020

Supplement sql script.

Rubik-W and others added 19 commits April 14, 2020 19:20
feature: apache#1923
43681ec
@wen-hemin
Merge branch 'dev' into feature-addUserState
cdcd2b6
@wen-hemin
Merge branch 'dev' into feature-addUserState
cfcd10b
Merge branch 'upstream-dev' into feature-addUserState
5e0d9b9 
# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java
fix：docker sql script add column
d4b2693
@wen-hemin
Merge branch 'dev' into feature-addUserState
77e9c33
@davidzollo
Merge branch 'dev' into feature-addUserState
ad609d1
Merge branch 'upstream-dev' into feature-addUserState
19d9f1b 
# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
fix: update sql script
3a6479d
fix: UT bug
2a7ef89
fix: UT bug
f1c087a
@wen-hemin
Merge branch 'dev' into feature-addUserState
4795115
fix: UT bug
6cbcd7c
fix: e2e UT bug
80a3da7
fix: e2e button location
75adeee
@wen-hemin
Merge branch 'dev' into feature-addUserState
26e7f41
Merge branch 'upstream-dev' into feature-addUserState
1263869 
# Conflicts:
#	dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
#	dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
#	dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
fix：sql init script to add t_ds_user.state column
6544fae
Merge branch 'upstream-dev' into feature-addUserState
f1d7282 
# Conflicts:
#	sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql
@wen-hemin wen-hemin requested a review from lenboo May 14, 2020 02:58
@codecov-io
Copy link
Copy Markdown

codecov-io commented May 14, 2020

Codecov Report

Merging #2710 into dev will decrease coverage by 0.15%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##                dev    #2710      +/-   ##
============================================
- Coverage     37.16%   37.01%   -0.16%     
+ Complexity     2548     2537      -11     
============================================
  Files           433      433              
  Lines         19958    19958              
  Branches       2423     2423              
============================================
- Hits           7417     7387      -30     
- Misses        11876    11902      +26     
- Partials        665      669       +4
Impacted Files Coverage Δ Complexity Δ
...duler/server/entity/DataxTaskExecutionContext.java 35.00% <0.00%> (-60.00%) 7.00% <0.00%> (-6.00%)
...he/dolphinscheduler/common/thread/ThreadUtils.java 68.25% <0.00%> (-9.53%) 13.00% <0.00%> (-2.00%)
...he/dolphinscheduler/api/service/LoggerService.java 82.60% <0.00%> (-8.70%) 9.00% <0.00%> (-1.00%)
...ver/master/consumer/TaskPriorityQueueConsumer.java 54.41% <0.00%> (-4.42%) 16.00% <0.00%> (ø%)
...e/dolphinscheduler/remote/NettyRemotingClient.java 51.07% <0.00%> (-2.88%) 9.00% <0.00%> (-2.00%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update de3a81c...f1d7282. Read the comment docs.

@wen-hemin wen-hemin mentioned this pull request May 14, 2020
Merged
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jun 4, 2020

Codecov Report

Merging #2710 into dev will decrease coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##                dev    #2710      +/-   ##
============================================
- Coverage     37.21%   37.20%   -0.01%     
  Complexity     2560     2560              
============================================
  Files           435      435              
  Lines         20020    20020              
  Branches       2426     2426              
============================================
- Hits           7451     7449       -2     
- Misses        11904    11905       +1     
- Partials        665      666       +1
Impacted Files Coverage Δ Complexity Δ
...he/dolphinscheduler/common/thread/ThreadUtils.java 74.60% <0.00%> (-3.18%) 14.00% <0.00%> (ø%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8f8ddae...df84b39. Read the comment docs.

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Jun 4, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

warning The version of Java (1.8.0_252) you have used to run this analysis is deprecated and we will stop accepting it from October 2020. Please update to at least Java 11.
Read more here

@gabry-lab
Copy link
Copy Markdown
Member

gabry-lab commented Jun 20, 2020

@rubik-w Does this PR still need to be merged?

@lgcareer
Copy link
Copy Markdown
Contributor

lgcareer commented Jun 22, 2020

@rubik-w Whether this field status add in the sql/upgreade folder

davidzollo
davidzollo approved these changes Jul 4, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@davidzollo davidzollo left a comment

Choose a reason for hiding this comment

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

+1

@davidzollo davidzollo self-requested a review July 4, 2020 08:06
davidzollo
davidzollo requested changes Jul 4, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@davidzollo davidzollo left a comment

Choose a reason for hiding this comment

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

please solve conflicting files locally

@qiaozhanwei
Copy link
Copy Markdown
Contributor

qiaozhanwei commented Jul 13, 2020

please solve conflicting

lgcareer
lgcareer reviewed Jul 14, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@lgcareer lgcareer left a comment

Choose a reason for hiding this comment

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

Hi,you need change 1.2.2_schema to 1.3.0_schema

Merge branch 'upstream-dev' into feature-addUserState
a304b4c 
# Conflicts:
#	sql/dolphinscheduler_mysql.sql
@wen-hemin
Copy link
Copy Markdown
Contributor Author

wen-hemin commented Jul 14, 2020

please solve conflicting files locally

fixed

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Jul 14, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

lgcareer
lgcareer approved these changes Jul 15, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@lgcareer lgcareer left a comment

Choose a reason for hiding this comment

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

+1

@lgcareer lgcareer requested a review from davidzollo July 15, 2020 03:16
@davidzollo davidzollo added the enhancement New feature or request label Jul 15, 2020
@davidzollo davidzollo mentioned this pull request Jul 15, 2020
Closed
@davidzollo davidzollo merged commit a7aa58e into apache:dev Jul 15, 2020
@wen-hemin wen-hemin deleted the feature-addUserState branch July 15, 2020 08:32
tswstarplanet pushed a commit to tswstarplanet/incubator-dolphinscheduler that referenced this pull request Jul 15, 2020
@wen-hemin @davidzollo
@qiaozhanwei @tswstarplanet
Feature add user state (apache#2710)
7b63799 
* feature: apache#1923

* fix：docker sql script add column

* fix: update sql script

* fix: UT bug

* fix: UT bug

* fix: UT bug

* fix: e2e UT bug

* fix: e2e button location

* fix：sql init script to add t_ds_user.state column

Co-authored-by: Rubik-W <whm_777@163.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
@wen-hemin wen-hemin restored the feature-addUserState branch August 10, 2020 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lgcareer lgcareer lgcareer approved these changes

@davidzollo davidzollo davidzollo approved these changes

@lenboo lenboo Awaiting requested review from lenboo

Assignees

No one assigned

Labels

enhancement New feature or request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@wen-hemin @codecov-io @codecov-commenter @gabry-lab @lgcareer @qiaozhanwei @davidzollo