Skip to content

[Feature][ui] Resume from force success#4160

Merged
davidzollo merged 4 commits intoapache:devfrom
yinancx:dev
Jan 10, 2021
Merged

[Feature][ui] Resume from force success#4160
davidzollo merged 4 commits intoapache:devfrom
yinancx:dev

Conversation

@yinancx
Copy link
Copy Markdown
Contributor

@yinancx yinancx commented Dec 3, 2020

What is the purpose of the pull request

  • Add a button 'Start From Force Success' at instance list page, available for instance with state FORCED_SUCCESS
  • Add a new execution type START_FROM_FORCED_SUCCESS for instance, for zh-cn, it calls 从强制成功处继续
  • Add related locale words.

Related issues

Brief change log

  • dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue Add a button and handlers for force success operation;
  • dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js and dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js Add related locale words.

@codecov-io
Copy link
Copy Markdown

codecov-io commented Dec 3, 2020

Codecov Report

Merging #4160 (cc2068b) into dev (61fcad7) will increase coverage by 1.31%.
The diff coverage is 37.05%.

Impacted file tree graph

@@             Coverage Diff              @@
##                dev    #4160      +/-   ##
============================================
+ Coverage     40.04%   41.36%   +1.31%     
- Complexity     2926     3113     +187     
============================================
  Files           459      467       +8     
  Lines         21793    22168     +375     
  Branches       2652     2720      +68     
============================================
+ Hits           8727     9169     +442     
+ Misses        12238    12115     -123     
- Partials        828      884      +56     
Impacted Files Coverage Δ Complexity Δ
...inscheduler/alert/utils/EnterpriseWeChatUtils.java 64.58% <0.00%> (+1.31%) 14.00 <0.00> (ø)
...cheduler/api/controller/AccessTokenController.java 8.33% <0.00%> (ø) 2.00 <0.00> (ø)
...hinscheduler/api/controller/ProjectController.java 5.55% <0.00%> (ø) 2.00 <0.00> (ø)
...nscheduler/api/controller/ResourcesController.java 1.98% <0.00%> (-0.11%) 2.00 <0.00> (ø)
...scheduler/api/controller/TaskRecordController.java 25.00% <ø> (ø) 2.00 <0.00> (ø)
...lphinscheduler/api/controller/UsersController.java 2.77% <0.00%> (ø) 2.00 <0.00> (ø)
...nscheduler/api/service/ProcessInstanceService.java 73.83% <0.00%> (ø) 36.00 <0.00> (ø)
...nscheduler/api/service/impl/LoggerServiceImpl.java 77.77% <ø> (ø) 11.00 <0.00> (ø)
...rg/apache/dolphinscheduler/common/enums/Event.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
.../dolphinscheduler/common/enums/SqoopQueryType.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
... and 180 more

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 61fcad7...cc2068b. Read the comment docs.

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Dec 3, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@CalvinKirs CalvinKirs added the UI ui and front end related label Dec 4, 2020
Copy link
Copy Markdown
Contributor

@break60 break60 left a comment

Choose a reason for hiding this comment

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

+1

@yinancx yinancx changed the title [Feature][ui] Start from force success [Feature][ui] Resume from force success Dec 4, 2020
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
good job

@davidzollo
Copy link
Copy Markdown
Contributor

could you solve conflict files locally?
Uploading image.png…

@davidzollo davidzollo added the Waiting for user feedback Waiting for feedback from issue/PR author label Dec 12, 2020
_resumeFromForcedSuccess (item, index) {
this._countDownFn({
id: item.id,
executeType: 'RESUME_FROM_FORCED_SUCCESS',
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

There is no execution type called RESUME_FROM_FORCED_SUCCESS in dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java, so it seems that submitting this execution type here will cause some problem.

@davidzollo davidzollo merged commit da74000 into apache:dev Jan 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

UI ui and front end related Waiting for user feedback Waiting for feedback from issue/PR author

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants