[Improvement-15815][ui] improving to find current version identifier（#15815） #15933

pusl6 · 2024-04-28T13:25:22Z

Purpose of the pull request

Brief change log

The version identifier of dolphinscheduler cannot be found on the UI. Please add the current version identifier on the UI.
在WEB 的UI界面上无法找到当前运行的 dolphinscheduler 版本信息，无法确定当前运行的版本。

Verify this pull request

This pull request is code cleanup without any test coverage.

(or)

This pull request is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

at testQueryProductInfo() method of UiPluginControllerTest class

(or)

If your pull request contain incompatible change, you should also add it to docs/docs/en/guide/upgrede/incompatible.md

…#15815）

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Version.java

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/VersionMapper.java

ruanwenjun · 2024-04-29T02:35:45Z

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UiPluginService.java


    Map<String, Object> queryUiPluginDetailById(int id);

+    Map<String, Object>  queryProductInfo(User loginUser, int userId);


Please use a specific object rather than `Map<String, Object> as the service method result.

ruanwenjun · 2024-04-29T02:38:06Z

Is this PR want to solve #15875 ?

SbloodyS

I can't find the code for the UI part. Where is it?

pusl6 · 2024-04-29T03:07:02Z

Is this PR want to solve #15875 ?

Is this PR want to solve #15875 ?
Yes, I am currently addressing the issue you mentioned

Is this PR want to solve #15875 ?
I am currently addressing the issue you mentioned, yes, and also addressing 15875

pusl6 · 2024-04-29T03:07:55Z

I can't find the code for the UI part. Where is it?

The front-end code has also been completed and will be submitted after the back-end is error free

SbloodyS · 2024-04-29T03:09:19Z

The front-end code has also been completed and will be submitted after the back-end is error free

Features like this need to be committed at both the backend and frontend.

pusl6 · 2024-04-29T03:14:29Z

The front-end code has also been completed and will be submitted after the back-end is error free

Features like this need to be committed at both the backend and frontend.

Okay, then I will modify the interface return class and resubmit the front-end and back-end code

ruanwenjun · 2024-04-29T08:15:15Z

The front-end code has also been completed and will be submitted after the back-end is error free

Features like this need to be committed at both the backend and frontend.

+1

…#15815）

pusl6 · 2024-04-30T09:03:16Z

The front-end code has also been completed and will be submitted after the back-end is error free

Features like this need to be committed at both the backend and frontend.

+1
I have modified the backend code as required and submitted the frontend code at the same time. Here is a screenshot of the completed version

pusl6 · 2024-04-30T09:04:12Z

The front-end code has also been completed and will be submitted after the back-end is error free

Features like this need to be committed at both the backend and frontend.

I have modified the backend code as required and submitted the frontend code at the same time. Here is a screenshot of the completed version

...heduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java

...ler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UiPluginControllerTest.java

dolphinscheduler-ui/src/locales/en_US/user-dropdown.ts

…#15815）

ruanwenjun · 2024-06-04T07:19:51Z

...heduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java

+
+    /**
+     * obtain project version and address
+     * @return product info
+     */


Suggested change

/**

* obtain project version and address

* @return product info

*/

/**

* obtain project version and address

* @return product info

*/

ruanwenjun · 2024-06-04T07:19:58Z

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/ProductInfoDto.java

+/**
+ * ProductInfoDto
+ */


Suggested change

/**

* ProductInfoDto

*/

/**

* ProductInfoDto

*/

My original idea for the throw code was to report errors when there is data but the version field is empty or null
Based on your proposal, I have made the following changes:

Remove error prompts and directly display unknown when missing data

Modify API URL path

Remove method comments

This comment is meaningless, you need to remove.

…#15815）

SbloodyS · 2024-06-07T08:38:41Z

...heduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java

+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import static org.apache.dolphinscheduler.api.enums.Status.*;


Avoid wildcard import.

Please use mvn spotless:apply to fix these.

Okay, I have executed it as required

…#15815）

codecov-commenter · 2024-06-13T12:55:00Z

Codecov Report

Attention: Patch coverage is 62.50000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 40.71%. Comparing base (834c320) to head (2fe4101).

❗ Current head 2fe4101 differs from pull request most recent head 8924bd8

Please upload reports for the commit 8924bd8 to get more accurate results.

Files	Patch %	Lines
...cheduler/api/service/impl/UiPluginServiceImpl.java	40.00%	3 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##                dev   #15933   +/-   ##
=========================================
  Coverage     40.71%   40.71%           
- Complexity     5246     5247    +1     
=========================================
  Files          1385     1385           
  Lines         46109    46117    +8     
  Branches       4923     4923           
=========================================
+ Hits          18771    18775    +4     
- Misses        25412    25415    +3     
- Partials       1926     1927    +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

ruanwenjun

Basically LGTM.

Some NIP, it's not a good idea to add a unknown version here, version is a must.

ruanwenjun · 2024-06-15T03:49:18Z

@SbloodyS PTAL

pusl6 · 2024-06-18T05:59:07Z

Some NIP, it's not a good idea to add a unknown version here, version is a must.

Thanks. In the scenario, unless the database version is empty, there will be no unknown

SbloodyS

Please resolve conflicts.

� Conflicts: � dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java

…#15815）

pusl6 · 2024-07-03T03:42:47Z

Please resolve conflicts.

oh, the reason for the conflict is that the enumeration class was not updated for a long time and has now been processed and resubmitted

SbloodyS

+1

sonarqubecloud · 2024-07-04T06:11:32Z

Quality Gate failed

Failed conditions
50.0% Coverage on New Code (required ≥ 60%)

See analysis details on SonarCloud

Fixed.

boring-cyborg · 2024-07-04T06:19:05Z

Awesome work, congrats on your first merged pull request!

[Improvement][ui] improving to find current version identifier（apache…

3a9e080

…#15815）

pusl6 requested review from SbloodyS and caishunfeng as code owners April 28, 2024 13:25

github-actions bot added the backend label Apr 28, 2024

ruanwenjun requested changes Apr 29, 2024

View reviewed changes

SbloodyS reviewed Apr 29, 2024

View reviewed changes

Merge branch 'apache:dev' into dev

35f0aac

[Improvement][ui] improving to find current version identifier（apache…

4ec8f9a

…#15815）

pusl6 requested review from Amy0104 and songjianet as code owners April 30, 2024 08:55

github-actions bot added the UI ui and front end related label Apr 30, 2024

SbloodyS reviewed Apr 30, 2024

View reviewed changes

[Improvement][ui] improving to find current version identifier（apache…

f808e70

…#15815）

wangxj3 previously approved these changes May 6, 2024

View reviewed changes

pusl6 changed the title ~~[Improvement][ui] improving to find current version identifier（#15815）~~ [Improvement - 15815][ui] improving to find current version identifier（#15815） May 6, 2024

pusl6 changed the title ~~[Improvement - 15815][ui] improving to find current version identifier（#15815）~~ [Improvement-15815][ui] improving to find current version identifier May 6, 2024

pusl6 and others added 2 commits May 6, 2024 17:23

Merge branch 'apache:dev' into dev

00fbaca

[Improvement][ui] improving to find current version identifier（apache…

b9fedfc

…#15815）

pusl6 dismissed wangxj3’s stale review via b9fedfc May 6, 2024 11:01

pusl6 changed the title ~~[Improvement-15815][ui] improving to find current version identifier~~ [Improvement-15815][ui] Improvement finding current version identifier May 6, 2024

pusl6 changed the title ~~[Improvement-15815][ui] Improvement finding current version identifier~~ [Improvement][ui] improving to find current version identifier（#15815） May 7, 2024

[Improvement][ui] improving to find current version identifier（apache…

c02e79d

…#15815）

ruanwenjun reviewed Jun 4, 2024

View reviewed changes

[Improvement][ui] improving to find current version identifier（apache…

b2abdd2

…#15815）

pusl6 requested a review from ruanwenjun June 4, 2024 10:08

SbloodyS requested changes Jun 7, 2024

View reviewed changes

[Improvement][ui] improving to find current version identifier（apache…

712cce8

…#15815）

pusl6 requested a review from SbloodyS June 13, 2024 10:34

ruanwenjun force-pushed the dev branch from c05fad8 to 8924bd8 Compare June 15, 2024 03:47

ruanwenjun previously approved these changes Jun 15, 2024

View reviewed changes

ruanwenjun added this to the 3.3.0 milestone Jun 15, 2024

ruanwenjun added the 3.3.0 label Jun 15, 2024

SbloodyS changed the title ~~[Improvement][ui] improving to find current version identifier（#15815）~~ [Improvement-15815][ui] improving to find current version identifier（#15815） Jul 1, 2024

SbloodyS reviewed Jul 2, 2024

View reviewed changes

pusl6 closed this Jul 3, 2024

pusl6 force-pushed the dev branch from 8924bd8 to ff0f7df Compare July 3, 2024 02:04

pusl6 added 2 commits July 3, 2024 10:13

Merge branch 'dev' of https://github.com/pusl6/dolphinscheduler into dev

e710549

� Conflicts: � dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java

[Improvement][ui] improving to find current version identifier（apache…

3198934

…#15815）

wangxj3 reopened this Jul 4, 2024

wangxj3 dismissed ruanwenjun’s stale review via 3198934 July 4, 2024 03:36

github-actions bot added the test label Jul 4, 2024

ruanwenjun approved these changes Jul 4, 2024

View reviewed changes

Merge branch 'dev' into dev

30114df

SbloodyS approved these changes Jul 4, 2024

View reviewed changes

SbloodyS merged commit 0d59dd0 into apache:dev Jul 4, 2024


		Map<String, Object> queryUiPluginDetailById(int id);

		Map<String, Object> queryProductInfo(User loginUser, int userId);

[Improvement-15815][ui] improving to find current version identifier（#15815） #15933

[Improvement-15815][ui] improving to find current version identifier（#15815） #15933

Uh oh!

Conversation

pusl6 commented Apr 28, 2024 • edited by SbloodyS Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose of the pull request

Brief change log

Verify this pull request

Uh oh!

Uh oh!

Uh oh!

ruanwenjun Apr 29, 2024

Choose a reason for hiding this comment

Uh oh!

ruanwenjun commented Apr 29, 2024

Uh oh!

SbloodyS left a comment

Choose a reason for hiding this comment

Uh oh!

pusl6 commented Apr 29, 2024

Uh oh!

pusl6 commented Apr 29, 2024

Uh oh!

SbloodyS commented Apr 29, 2024

Uh oh!

pusl6 commented Apr 29, 2024

Uh oh!

ruanwenjun commented Apr 29, 2024

Uh oh!

pusl6 commented Apr 30, 2024

Uh oh!

pusl6 commented Apr 30, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ruanwenjun Jun 4, 2024

Choose a reason for hiding this comment

Uh oh!

ruanwenjun Jun 4, 2024

Choose a reason for hiding this comment

Uh oh!

pusl6 Jun 4, 2024

Choose a reason for hiding this comment

Uh oh!

ruanwenjun Jun 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SbloodyS Jun 7, 2024

Choose a reason for hiding this comment

Uh oh!

ruanwenjun Jun 7, 2024

Choose a reason for hiding this comment

Uh oh!

pusl6 Jun 13, 2024

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented Jun 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ruanwenjun left a comment

Choose a reason for hiding this comment

Uh oh!

ruanwenjun commented Jun 15, 2024

Uh oh!

pusl6 commented Jun 18, 2024 • edited by SbloodyS Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SbloodyS left a comment

Choose a reason for hiding this comment

Uh oh!

pusl6 commented Jul 3, 2024

Uh oh!

SbloodyS left a comment

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Jul 4, 2024

pusl6 commented Apr 28, 2024 •

edited by SbloodyS

Loading

ruanwenjun Jun 7, 2024 •

edited

Loading

codecov-commenter commented Jun 13, 2024 •

edited

Loading

pusl6 commented Jun 18, 2024 •

edited by SbloodyS

Loading