Adm 793 [frontend] Reduce the time of timeout to 10 minutes #1141

doujiao-001 · 2024-03-13T02:41:49Z

Summary

Reduce the time of timeout to 10 minutes

Before

Description

Screenshots

After

Description

Screenshots

Note

Null

…fig page

…or three settings

…rceControlClient.ts and PipelineToolClient.ts

…ourceControlClient.test.ts

…ontrolTokenEffect

…test case name

…#1133) * ADM-856:[backend]feat: update buildkite feign client decoder error message * ADM-856:[backend]feat: update github feign client decoder error message * ADM-856:[backend]feat: update jira feign client decoder error message --------- Co-authored-by: guzhongren <guzhongren@live.cn>

…ork and api design (#1137) * ADM-697:[docx] docx: add docx spike the logic of calculating card rework and api design * ADM-697:[docx] docx: add spike export rework content when generate board csv * ADM-697:[docx] docx: add spike calculate rework times * ADM-697:[docx] docx: rewrite the doc of calculate rework times when don't check "Consider the 'Flag' as 'Block' * ADM-697:[docx] docx: add logic for consider flag is block * ADM-697:[docx] docx: fix some words * ADM-697:[docx] docx: add logic of judge is our need rework --------- Co-authored-by: yulongcai <yulong.cai@thoughtworks.com>

* ADM-691: [frontend] feat: add new metrics field * ADM-691: [frontend] feat: add rework setting title * ADM-691: [frontend] feat: complete basic function about rework settings * ADM-691: [frontend] feat: use redux to store fields * ADM-691: [frontend] feat: replace undefind to null * ADM-691: [frontend] feat: import config with rework times settings * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] chore: refactor code after cr * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] test: improve test coverage * ADM-691: [frontend] test: remove unused code * ADM-691: [frontend] test: add test for rework setting * ADM-691: [frontend] fix: fix e2e * ADM-691: [frontend] fix: fix sonar --------- Co-authored-by: Leiqiuhong <qiuhong.lei@thoughtworks.com>

…ogic (#1140) * ADM-837:[docs]feat: add half completed spike doc * ADM-837: [docs] completed spike solution for export-allMetrics button polling api. * ADM-837: [docs] completed spike design for export-allMetrics button polling api. * ADM-837: [docs] add note to notice allMetricCompleted as true --------- Co-authored-by: Yunlong Gan <yunlong.gan@thoughtworks.com>

codacy-production · 2024-03-13T02:41:52Z

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation	Diff coverage
✅ +0.00%	∅

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (`842ce0b`)	6010	6010	100.00%
Head commit (`6fafbe2`)	6059 (+49)	6059 (+49)	100.00% (+0.00%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#1141)	0	0	∅ (not applicable)

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings Change summary preferences

_{You may notice some variations in coverage metrics with the latest Coverage engine update. For more details, visit the documentation}

codacy-production · 2024-03-13T02:41:52Z

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation	Diff coverage
✅ +0.00%	✅ 100.00%

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (`de2b97a`)	6012	6012	100.00%
Head commit (`5e626a8`)	12134 (+6122)	12134 (+6122)	100.00% (+0.00%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#1141)	81	81	100.00%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings Change summary preferences

_{You may notice some variations in coverage metrics with the latest Coverage engine update. For more details, visit the documentation}

github-actions · 2024-03-13T02:41:58Z

Hi @doujiao-001! 👋
Thank you for submitting a pull request! We appreciate your contribution and will review your changes as soon as possible.

guzhongren · 2024-03-13T03:21:34Z

Reverify? Verify again?

guzhongren · 2024-03-13T03:25:02Z

frontend/__tests__/containers/ConfigStep/ConfigButtonGroup.test.tsx

+import React from 'react';
+
+describe('ConfigButtonGroup', () => {
+  const setup = (isVerified: boolean, isLoading: boolean, isHBTimeOut: boolean, isDisableVerifyButton: boolean) => {


IsHBTimeout?isConfigTimeout??

收到，我理解是尽量避免变量名不涉及项目信息？比如IsHBTimeout中HB涉及到了，应换个普通点的名称？

guzhongren · 2024-03-13T03:25:23Z

frontend/__tests__/containers/ConfigStep/ConfigButtonGroup.test.tsx

+  };
+
+  it('should render a disabled VerifyButton with "Verified" text when isVerified is true and isLoading is false', () => {
+    setup(true, false, false, false); // Use a different moduleType for clarity


guzhongren · 2024-03-13T03:26:33Z

frontend/__tests__/containers/ConfigStep/ConfigButtonGroup.test.tsx

+    );
+  };
+
+  it('should render a disabled VerifyButton with "Verified" text when isVerified is true and isLoading is false', () => {


When - given，看一哈should given when 分别写什么

guzhongren · 2024-03-13T03:26:45Z

frontend/__tests__/containers/ConfigStep/ConfigButtonGroup.test.tsx

+    expect(screen.getByText('Verified')).toBeDisabled();
+  });
+  it('should render a VerifyButton with "Reverify" text when isHBTimeOut is true', () => {
+    setup(false, false, true, false); // Use a different moduleType for clarity


frontend/__tests__/containers/ConfigStep/TimeoutAlet.test.tsx

guzhongren · 2024-03-13T03:28:46Z

frontend/__tests__/hooks/useVerifyBoardEffect.test.tsx

-        );
-      }),
-    );
+  it('should clear email validatedError when updateField by Email', async () => {


Should Given when

guzhongren · 2024-03-13T03:29:55Z

frontend/__tests__/hooks/useVerifyBoardEffect.test.tsx

@@ -148,4 +143,19 @@ describe('use verify board state', () => {
    expect(emailFiled?.verifiedError).toBe('');
    expect(tokenField?.verifiedError).toBe('');
  });
+
+  it('should set timeout is true when getVerifyBoard api is timeout', async () => {


guzhongren · 2024-03-13T03:31:08Z

frontend/__tests__/hooks/useVerifySourceControlTokenEffect.test.tsx

+
+  it('should isHBTimeOut and isShowAlert is true  when api timeout', async () => {
+    sourceControlClient.verifyToken = jest.fn().mockResolvedValue({
+      code: HEARTBEAT_EXCEPTION_CODE.TIMEOUT,


为什么常量要和项目名挂钩？

这个是之前存在的变量名，我再去找相关人员确认下是否更改一下不要包含项目名称

guzhongren · 2024-03-13T03:33:41Z

frontend/src/containers/ConfigStep/SourceControl/index.tsx

-      </StyledForm>
-    </ConfigSectionContainer>
+    <>
+      <TimeoutAlert


能把这个组件当child传进来吗？隔离组件深度

Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](softprops/action-gh-release@v1...v2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: guzhongren <guzhongren@live.cn>

* chore: extend the overall timeout of e2e 1 more minute. * distinguish local and CI for overall timeout.

* ADM-691: [frontend] fix: add request fields * ADM-691: [frontend] fix: fix sonar cloud * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] chore: modify sytle, rename field * ADM-691: [frontend] fix: fix sonar issue * ADM-691: [frontend] fix: remove unused code --------- Co-authored-by: Leiqiuhong <qiuhong.lei@thoughtworks.com>

sonarqubecloud · 2024-03-14T06:12:36Z

Quality Gate passed for 'heartbeat-backend'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

sonarqubecloud · 2024-03-14T06:14:16Z

Quality Gate passed for 'au-heartbeat-heartbeat-frontend'

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

guzhongren · 2024-03-14T06:45:13Z

frontend/__tests__/client/SourceControlClient.test.ts

@@ -40,7 +44,7 @@ describe('verify sourceControl request', () => {
      ),
    );

-    sourceControlClient.verifyToken(MOCK_SOURCE_CONTROL_VERIFY_REQUEST_PARAMS).catch((e) => {
+    sourceControlClient.verifyToken(MOCK_SOURCE_CONTROL_VERIFY_REQUEST_PARAMS, jest.fn(), jest.fn()).catch((e) => {


不要用catch接，用reject.throw接错误

guzhongren · 2024-03-14T06:45:24Z

frontend/__tests__/client/SourceControlClient.test.ts

@@ -58,7 +62,7 @@ describe('verify sourceControl request', () => {
      ),
    );

-    sourceControlClient.verifyToken(MOCK_SOURCE_CONTROL_VERIFY_REQUEST_PARAMS).catch((e) => {
+    sourceControlClient.verifyToken(MOCK_SOURCE_CONTROL_VERIFY_REQUEST_PARAMS, jest.fn(), jest.fn()).catch((e) => {


一样的问题

原则:测试不要出现类似try catch的代码

guzhongren · 2024-03-14T06:54:59Z

frontend/__tests__/hooks/useVerifyBoardEffect.test.tsx

+
+    await waitFor(() => {
+      const isVerifyTimeOut = result.current.isVerifyTimeOut;
+      expect(isVerifyTimeOut).toBe(true);


guzhongren · 2024-03-14T06:56:00Z

frontend/__tests__/hooks/useVerifySourceControlTokenEffect.test.tsx

+
+    await waitFor(() => {
+      expect(result.current.isVerifyTimeOut).toEqual(true);
+      expect(result.current.isShowAlert).toEqual(true);


guzhongren · 2024-03-14T07:07:14Z

2new issues in sonar cloud

* AMD-793 [frontend] feature: add reverify logic and timeout alert * AMD-793 [frontend] refactor: abstract config button component for config page * AMD-793 [frontend] refactor: abstract timeout alert component for config page * AMD-793 [frontend] feat: add timeout alert component to config page for three settings * AMD-793 [frontend] test: add test for timeout alert component * AMD-793 [frontend] test: add test for config button group component * [ADM-793] style: fix css check * AMD-793 [frontend] fix: set HB timeout and timeout alert false in SourceControlClient.ts and PipelineToolClient.ts * AMD-793 [frontend] fix: fix test for PipelineToolClient.test.ts and SourceControlClient.test.ts * [ADM-793] style: fix border css * [ADM-793] test: fix test for useVerifyBoardEffect * AMD-793 [frontend] test: add test of isHBTimeout for useVerifySourceControlTokenEffect * [ADM-793] test: add test for useVerifyPipelineToolEffect * [ADM-793] test: add test for getFieldsWithNoVerifiedError * AMD-793 [frontend] test: remove not use mock in test file and change test case name * ADM-856:[backend]feat: update all feign clients decoder error message (#1133) * ADM-856:[backend]feat: update buildkite feign client decoder error message * ADM-856:[backend]feat: update github feign client decoder error message * ADM-856:[backend]feat: update jira feign client decoder error message --------- Co-authored-by: guzhongren <guzhongren@live.cn> * ADM-697:[docx] docx: add docx spike the logic of calculating card rework and api design (#1137) * ADM-697:[docx] docx: add docx spike the logic of calculating card rework and api design * ADM-697:[docx] docx: add spike export rework content when generate board csv * ADM-697:[docx] docx: add spike calculate rework times * ADM-697:[docx] docx: rewrite the doc of calculate rework times when don't check "Consider the 'Flag' as 'Block' * ADM-697:[docx] docx: add logic for consider flag is block * ADM-697:[docx] docx: fix some words * ADM-697:[docx] docx: add logic of judge is our need rework --------- Co-authored-by: yulongcai <yulong.cai@thoughtworks.com> * ADM-691: [frontend] feat: add feat about rework settings (#1138) * ADM-691: [frontend] feat: add new metrics field * ADM-691: [frontend] feat: add rework setting title * ADM-691: [frontend] feat: complete basic function about rework settings * ADM-691: [frontend] feat: use redux to store fields * ADM-691: [frontend] feat: replace undefind to null * ADM-691: [frontend] feat: import config with rework times settings * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] chore: refactor code after cr * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] test: improve test coverage * ADM-691: [frontend] test: remove unused code * ADM-691: [frontend] test: add test for rework setting * ADM-691: [frontend] fix: fix e2e * ADM-691: [frontend] fix: fix sonar --------- Co-authored-by: Leiqiuhong <qiuhong.lei@thoughtworks.com> * ADM-856:[backend]feat: add decode default case error message (#1139) * ADM-837：[docs] docs: spike about optimizing generate report backend logic (#1140) * ADM-837:[docs]feat: add half completed spike doc * ADM-837: [docs] completed spike solution for export-allMetrics button polling api. * ADM-837: [docs] completed spike design for export-allMetrics button polling api. * ADM-837: [docs] add note to notice allMetricCompleted as true --------- Co-authored-by: Yunlong Gan <yunlong.gan@thoughtworks.com> * add test case * AMD-793 [frontend] style: fix color for reverify button * [ADM-793] fix: revert httpTimeout * Build(deps): bump softprops/action-gh-release from 1 to 2 (#1136) Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](softprops/action-gh-release@v1...v2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: guzhongren <guzhongren@live.cn> * AMD-793 [frontend] fix: remove annotation in test file * AMD-793 [frontend] fix: update test name for clear * AMD-793 [frontend] fix: update test name use given when then * chore: extend the overall timeout of e2e 1 more minute. (#1144) * chore: extend the overall timeout of e2e 1 more minute. * distinguish local and CI for overall timeout. * ADM-691: [frontend] fix: add request fields (#1143) * ADM-691: [frontend] fix: add request fields * ADM-691: [frontend] fix: fix sonar cloud * ADM-691: [frontend] fix: fix unit test * ADM-691: [frontend] chore: modify sytle, rename field * ADM-691: [frontend] fix: fix sonar issue * ADM-691: [frontend] fix: remove unused code --------- Co-authored-by: Leiqiuhong <qiuhong.lei@thoughtworks.com> * ADM-691: [frontend] fix: fix sonar issue (#1145) * [ADM-793] refactor: rename AXIOS_REQUEST_ERROR_CODE * AMD-793 [frontend] fix: update alert position to keep element still * [ADM-793] feat: enhance style for alert * [ADM-793] feat: change moduleType text * [ADM-793] style: enhance style --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: yp.wu <yiping.wu@yipings-MacBook-Pro.local> Co-authored-by: xuebing <xuebing.li@thoughtworks.com> Co-authored-by: yp.wu <yiping.wu@192.168.10.4> Co-authored-by: Steveay <907221539@qq.com> Co-authored-by: guzhongren <guzhongren@live.cn> Co-authored-by: Genhao Liu <103744663+Liughgood@users.noreply.github.com> Co-authored-by: yulongcai <yulong.cai@thoughtworks.com> Co-authored-by: neomgb <123063936+neomgb@users.noreply.github.com> Co-authored-by: Leiqiuhong <qiuhong.lei@thoughtworks.com> Co-authored-by: sqsq5566 <154306546+sqsq5566@users.noreply.github.com> Co-authored-by: Yunlong Gan <yunlong.gan@thoughtworks.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: 李雪冰 <33832990+lxuebing@users.noreply.github.com> Co-authored-by: Chao <89126516+mrcuriosity-tw@users.noreply.github.com>

yp.wu and others added 26 commits March 7, 2024 16:42

AMD-793 [frontend] feature: add reverify logic and timeout alert

e6b9ee1

AMD-793 [frontend] refactor: abstract config button component for con…

fc01550

…fig page

Merge branch 'main' into ADM-793

2354ced

AMD-793 [frontend] refactor: abstract timeout alert component for con…

01ab2ed

…fig page

AMD-793 [frontend] feat: add timeout alert component to config page f…

12f8c26

…or three settings

AMD-793 [frontend] fix: merge main to 793

a59dfb5

AMD-793 [frontend] test: add test for timeout alert component

f619f9c

AMD-793 [frontend] test: add test for config button group component

d38f126

Merge branch 'main' into ADM-793

4e3917c

[ADM-793] style: fix css check

49ff6a8

AMD-793 [frontend] fix: set HB timeout and timeout alert false in Sou…

67817c1

…rceControlClient.ts and PipelineToolClient.ts

AMD-793 [frontend] fix: fix test for PipelineToolClient.test.ts and S…

e132606

…ourceControlClient.test.ts

[ADM-793] style: fix border css

c6eb632

[ADM-793] test: fix test for useVerifyBoardEffect

8bc183b

AMD-793 [frontend] test: add test of isHBTimeout for useVerifySourceC…

3345b5b

…ontrolTokenEffect

[ADM-793] test: add test for useVerifyPipelineToolEffect

4ac618e

[ADM-793] test: add test for getFieldsWithNoVerifiedError

7b7b851

AMD-793 [frontend] test: remove not use mock in test file and change …

666654c

…test case name

ADM-856:[backend]feat: add decode default case error message (#1139)

87265f8

add test case

5e7a7bf

Merge branch 'main' into ADM-793

e3558f4

AMD-793 [frontend] style: fix color for reverify button

6fafbe2

doujiao-001 requested a review from neomgb March 13, 2024 02:41

guzhongren requested changes Mar 13, 2024

View reviewed changes

xuebing and others added 5 commits March 13, 2024 11:37

[ADM-793] fix: revert httpTimeout

ae3c971

Merge branch 'main' into ADM-793

e0dd764

AMD-793 [frontend] fix: remove annotation in test file

575e9bd

AMD-793 [frontend] fix: update test name for clear

94899f5

doujiao-001 requested a review from guzhongren March 13, 2024 06:13

yp.wu and others added 5 commits March 13, 2024 17:53

AMD-793 [frontend] fix: update test name use given when then

210c6ea

chore: extend the overall timeout of e2e 1 more minute. (#1144)

e06a936

* chore: extend the overall timeout of e2e 1 more minute. * distinguish local and CI for overall timeout.

ADM-691: [frontend] fix: fix sonar issue (#1145)

7683e22

[ADM-793] refactor: rename AXIOS_REQUEST_ERROR_CODE

7512069

neomgb approved these changes Mar 14, 2024

View reviewed changes

lxuebing and others added 5 commits March 14, 2024 10:19

Merge branch 'main' into ADM-793

c5f66ee

AMD-793 [frontend] fix: update alert position to keep element still

9f0b012

[ADM-793] feat: enhance style for alert

5e626a8

[ADM-793] feat: change moduleType text

b331d3c

[ADM-793] style: enhance style

76df053

guzhongren approved these changes Mar 14, 2024

View reviewed changes

lxuebing merged commit d10482c into main Mar 14, 2024
49 checks passed

lxuebing deleted the ADM-793 branch March 14, 2024 07:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adm 793 [frontend] Reduce the time of timeout to 10 minutes #1141

Adm 793 [frontend] Reduce the time of timeout to 10 minutes #1141

doujiao-001 commented Mar 13, 2024 •

edited by lxuebing

Loading

codacy-production bot commented Mar 13, 2024

codacy-production bot commented Mar 13, 2024 •

edited

Loading

github-actions bot commented Mar 13, 2024

guzhongren commented Mar 13, 2024

guzhongren Mar 13, 2024

doujiao-001 Mar 13, 2024

guzhongren Mar 13, 2024

guzhongren Mar 13, 2024

guzhongren Mar 13, 2024

guzhongren Mar 13, 2024

guzhongren Mar 13, 2024

guzhongren Mar 13, 2024

doujiao-001 Mar 13, 2024

guzhongren Mar 13, 2024

sonarqubecloud bot commented Mar 14, 2024

sonarqubecloud bot commented Mar 14, 2024

guzhongren Mar 14, 2024

guzhongren Mar 14, 2024

guzhongren Mar 14, 2024

guzhongren Mar 14, 2024

guzhongren Mar 14, 2024

guzhongren commented Mar 14, 2024

Adm 793 [frontend] Reduce the time of timeout to 10 minutes #1141

Adm 793 [frontend] Reduce the time of timeout to 10 minutes #1141

Conversation

doujiao-001 commented Mar 13, 2024 • edited by lxuebing Loading

Summary

Before

After

Note

codacy-production bot commented Mar 13, 2024

Coverage summary from Codacy

codacy-production bot commented Mar 13, 2024 • edited Loading

Coverage summary from Codacy

github-actions bot commented Mar 13, 2024

guzhongren commented Mar 13, 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

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

sonarqubecloud bot commented Mar 14, 2024

Quality Gate passed for 'heartbeat-backend'

sonarqubecloud bot commented Mar 14, 2024

Quality Gate passed for 'au-heartbeat-heartbeat-frontend'

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

guzhongren commented Mar 14, 2024

doujiao-001 commented Mar 13, 2024 •

edited by lxuebing

Loading

codacy-production bot commented Mar 13, 2024 •

edited

Loading