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

FalconSL · 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）

ruanwenjun · 2024-04-29T02:33:58Z

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

+
+@Data
+@TableName("t_ds_version")
+public class Version {


There already exist DsVersion

ruanwenjun · 2024-04-29T02:34:19Z

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

+/**
+ * user mapper interface
+ */
+public interface VersionMapper extends BaseMapper<Version> {


Duplicate with DsVersionMapper.

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

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

@@ -30,4 +32,6 @@ public interface UiPluginService {

    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?

FalconSL · 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

FalconSL · 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.

FalconSL · 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）

FalconSL · 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

FalconSL · 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-05-08T06:14:06Z

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

+    public Result<ProductInfoDto> queryProductInfo(
+            @Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+            @RequestParam(value = "userId") Integer userId) {
+        ProductInfoDto result = uiPluginService.queryProductInfo(loginUser, userId);
+        return Result.success(result);


Suggested change

public Result<ProductInfoDto> queryProductInfo(

@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,

@RequestParam(value = "userId") Integer userId) {

ProductInfoDto result = uiPluginService.queryProductInfo(loginUser, userId);

return Result.success(result);

public Result<ProductInfoDto> queryProductInfo(

@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {

ProductInfoDto result = uiPluginService.queryProductInfo(loginUser);

return Result.success(result);

ruanwenjun · 2024-05-08T06:18:53Z

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

+    ProductInfoDto queryProductInfo(User loginUser, int userId);
+


It's weird that there exists a method queryProductInfo in uiPluginServer.

ruanwenjun · 2024-05-08T06:20:01Z

...uler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UiPluginServiceImpl.java

+    public ProductInfoDto queryProductInfo(User loginUser, int userId) {
+
+        // check if user is existed
+        if (userId <= 0 || !(loginUser.getId() == userId)) {
+            throw new ServiceException(Status.REQUEST_PARAMS_NOT_VALID_ERROR,
+                    "User id: " + userId + " should not less than or equals to 0.");
+        }
+        // persist to the database
+        DsVersion dsVersion = dsVersionMapper.selectById(1);
+
+        if(StringUtils.isBlank(dsVersion.getVersion())){
+            throw new ServiceException(Status.VERSION_INFO_STATE_ERROR);
+        }
+        ProductInfoDto result = new ProductInfoDto();
+        result.setId(dsVersion.getId());
+        result.setVersion(dsVersion.getVersion());
+        return result;


Don't query the version by id, id might changed.

ruanwenjun · 2024-05-08T06:20:55Z

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

+
+        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
+        Assertions.assertEquals(Status.SUCCESS.getCode(), result.getCode().intValue());
+        logger.info(mvcResult.getResponse().getContentAsString());


Don't use log in UT

ruanwenjun · 2024-05-08T06:21:52Z

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

+    private User getLoginUser() {
+        User user = new User();
+        user.setId(1);
+        user.setUserName("admin");
+        return user;
+    }


Don't add useless code

Don't add useless code

Based on your proposal, I have made the following modifications:

Remove the userid from the input parameter

Change the query for version to selectVersion ()

Remove log() and redundant methods in UT
In addition, the queryProductInfo method in uiPluginService was submitted this time and there are no duplicate named methods in the project, so the method name has not been changed

…#15815）

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

@@ -30,4 +32,6 @@

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

+    ProductInfoDto queryProductInfo(User loginUser);


wangxj3

LGTM

caishunfeng

some nip

caishunfeng · 2024-05-11T10:07:41Z

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

+//     * @param loginUser login user
+//     * @param userId token for user


Suggested change

// * @param loginUser login user

// * @param userId token for user

caishunfeng · 2024-05-11T10:09:15Z

...uler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UiPluginServiceImpl.java

+    @Autowired
+    DsVersionMapper dsVersionMapper;
+
+    @Autowired
+    private DsVersionDao dsVersionDao;


It's better to use dao in service but not mapper.

Suggested change

@Autowired

DsVersionMapper dsVersionMapper;

@Autowired

private DsVersionDao dsVersionDao;

@Autowired

private DsVersionDao dsVersionDao;

It's better to use dao in service but not mapper.

You are right. The actual method used is dsVersionDao, which was not deleted during the last modification. I will delete it immediately

…#15815）

wangxj3

LGTM

songjianet

Please deal with the above issues.

songjianet · 2024-05-15T05:27:32Z

Personally, I feel that there is no need to use a separate page to display the current version. You can put the version information at the top of this drop-down menu.

…#15815）

FalconSL · 2024-05-15T06:41:21Z

Personally, I feel that there is no need to use a separate page to display the current version. You can put the version information at the top of this drop-down menu.

Okay, I have removed the unused front-end references. According to my original plan, after completing the version function, document help, problem report submission, policy instructions, and service terms will also be placed on this page. If the version information is placed separately in the homepage column and other functions are added, it will appear crowded

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

3a9e080

…#15815）

FalconSL requested review from caishunfeng and SbloodyS 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）

FalconSL requested review from songjianet and Amy0104 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

FalconSL 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

FalconSL 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

FalconSL 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）

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

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

FalconSL 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）

wangxj3 added the first time contributor First-time contributor label May 8, 2024

Merge branch 'dev' into dev

5043916

ruanwenjun requested changes May 8, 2024

View reviewed changes

SbloodyS assigned FalconSL May 8, 2024

SbloodyS added the improvement make more easy to user or prompt friendly label May 8, 2024

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

db81822

…#15815）

github-advanced-security bot found potential problems May 8, 2024

View reviewed changes

FalconSL requested a review from ruanwenjun May 9, 2024 03:18

wangxj3 previously approved these changes May 11, 2024

View reviewed changes

caishunfeng previously approved these changes May 11, 2024

View reviewed changes

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

a524f5e

…#15815）

FalconSL dismissed stale reviews from caishunfeng and wangxj3 via a524f5e May 11, 2024 10:19

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

a188699

…#15815）

FalconSL requested review from caishunfeng, SbloodyS and wangxj3 May 13, 2024 09:27

wangxj3 previously approved these changes May 13, 2024

View reviewed changes

songjianet requested changes May 15, 2024

View reviewed changes

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

1e7b930

…#15815）

FalconSL dismissed wangxj3’s stale review via 1e7b930 May 15, 2024 06:35

FalconSL requested a review from songjianet May 15, 2024 06:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

FalconSL commented Apr 28, 2024 •

edited by SbloodyS

ruanwenjun Apr 29, 2024

ruanwenjun Apr 29, 2024

ruanwenjun Apr 29, 2024

ruanwenjun commented Apr 29, 2024

SbloodyS left a comment

FalconSL commented Apr 29, 2024

FalconSL commented Apr 29, 2024

SbloodyS commented Apr 29, 2024

FalconSL commented Apr 29, 2024

ruanwenjun commented Apr 29, 2024

FalconSL commented Apr 30, 2024

FalconSL commented Apr 30, 2024

ruanwenjun May 8, 2024

ruanwenjun May 8, 2024

ruanwenjun May 8, 2024

ruanwenjun May 8, 2024

ruanwenjun May 8, 2024

FalconSL May 8, 2024

wangxj3 left a comment

caishunfeng left a comment

caishunfeng May 11, 2024

caishunfeng May 11, 2024

FalconSL May 11, 2024

wangxj3 left a comment

songjianet left a comment

songjianet commented May 15, 2024

FalconSL commented May 15, 2024

		@@ -30,4 +32,6 @@ public interface UiPluginService {

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

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

		ProductInfoDto queryProductInfo(User loginUser, int userId);

		@@ -30,4 +32,6 @@

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

		ProductInfoDto queryProductInfo(User loginUser);

		// * @param loginUser login user
		// * @param userId token for user

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

Are you sure you want to change the base?

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

Conversation

FalconSL commented Apr 28, 2024 • edited by SbloodyS

Purpose of the pull request

Brief change log

Verify this pull request

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ruanwenjun commented Apr 29, 2024

SbloodyS left a comment

Choose a reason for hiding this comment

FalconSL commented Apr 29, 2024

FalconSL commented Apr 29, 2024

SbloodyS commented Apr 29, 2024

FalconSL commented Apr 29, 2024

ruanwenjun commented Apr 29, 2024

FalconSL commented Apr 30, 2024

FalconSL commented Apr 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wangxj3 left a comment

Choose a reason for hiding this comment

caishunfeng left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wangxj3 left a comment

Choose a reason for hiding this comment

songjianet left a comment

Choose a reason for hiding this comment

songjianet commented May 15, 2024

FalconSL commented May 15, 2024

FalconSL commented Apr 28, 2024 •

edited by SbloodyS