Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase back to main branch #108

Merged
merged 227 commits into from
Apr 12, 2024
Merged

Rebase back to main branch #108

merged 227 commits into from
Apr 12, 2024

Conversation

davidwangcn9
Copy link
Collaborator

Summary

Regularly rebase back to main branch

Before

Description

Screenshots
If applicable, add screenshots to help explain behavior of your code.

After

Description

Screenshots
If applicable, add screenshots to help explain behavior of your code.

Note

Null

yulongcai and others added 30 commits March 4, 2024 15:23
…atch for imported data. (#1105)

Co-authored-by: Xingmeng Tao <xmtao@thoughtworks.com>
* ADM-831:[frontend]feat: add pipeline is future time check

* ADM-831:[frontend]test: add pipeline is future time test

* ADM-831:[frontend]refactor: use dayjs replace raw code

* ADM-831:[frontend]refactor: use lower camel case replace

* ADM-831:[frontend]test: add pipeline container when selected past time
…tep (#1111)

* ADM-841: [frontend] fix: show board configuration config in metrics step

* ADM-841: [frontend] fix: fix test

* ADM-841: [frontend] fix: rename field

* ADM-841: [frontend] fix: fix test
* ADM-831:[frontend]test: update time mock

* ADM-831:[frontend]test: rename test
* ADM-767 [frontend] feat: add getOptionDisabled logic

* ADM-767 [frontend] test: add test
…1114)

* [kai.zhou][adm-818]: handle hide loading button when pipeline info get failed

* [kai.zhou][adm-818]: fix code

---------

Co-authored-by: zhoukai <zhoukai@zhous-MacBook-Pro.local>
* ADM-841: [frontend] fix: fix next button display logic

* ADM-841: [frontend] fix: rename field

* ADM-841: [frontend] fix: rename field
* ADM-767 [frontend] feat: sort the disabled options

* ADM-767 [frontend] feat: delete log
…reload (#1122)

* ADM-839[frontend]delete time in board verify API

* ADM-839[frontend]fix change time then board configuration should reload
* ADM-789:[Docs] update E2E docs

* ADM-789:[Docs] update E2E uml
* pref(sonar): exclude some source

* pref(sonar): exclude some source
* pref(sonar): exclude some source

* pref(sonar): exclude some source
* ADM-826 [frontend] style: enhance style for report detail

* AMD-826 [frontend] refactor: abstract boardColor const to theme config

* [frontend] ADM-767: sort the disabled options (#1119)

* ADM-767 [frontend] feat: sort the disabled options

* ADM-767 [frontend] feat: delete log

* fix: put swagger host in the env[backend] (#1120)

* [ADM-826] test: fix e2e test

* [ADM-767] test: add test for sort

---------

Co-authored-by: yp.wu <yiping.wu@yipings-MacBook-Pro.local>
* Revert "ADM-831:[frontend]feat: add pipeline is future time check (#1112)"

This reverts commit 213b20a.

* Revert "ADM-831:[frontend]feat: add pipeline is future time check (#1110)"

This reverts commit a138df4.

* ADM-831:[frontend]feat: add future time check for metrics step

* ADM-831:[frontend]test: add test for pipeline metrics future time check

* Revert "ADM-831:[frontend]test: add test for pipeline metrics future time check"

This reverts commit a3c12b5.

* Revert "ADM-831:[frontend]feat: add future time check for metrics step"

This reverts commit 3d3f44d.

* ADM-831:[frontend]feat: add future time check for metrics step

* ADM-831:[frontend]refactor: adjust import code

* ADM-831:[frontend]test: add test for pipeline metrics future time check
…te in linxu-container/macos and low capability of errors
mrcuriosity-tw and others added 28 commits April 8, 2024 16:27
…selection. (#1342)

* [ADM-877][frontend]: feat: remove the limit of start-date & end-date selection.

* [ADM-877][frontend]: chore: refine code.
* ADM-873-bug:[docx] docx: fix docx

* ADM-873:[frontend]fix: fix error notification

* ADM-873:[frontend]refactor: refactor code

* ADM-873-bug:[backend] feat: return flag for whether it has file create by this invoke

* Revert "ADM-873:[frontend]refactor: refactor code"

This reverts commit e2fe52f.

* Revert "ADM-873:[frontend]fix: fix error notification"

This reverts commit b659c63.

* ADM-873:[frontend]fix: use hasCsvFileCreateSuccessful to handle success notification

* ADM-873-bug:[backend] feat: return has csv create successful when get completed

* ADM-873-bug:[backend] fix: rename

* ADM-873:[frontend]fix: fix test

* ADM-873:[frontend]refactor: rename hasCsvFileCreateSuccessful to isSuccessfulCreateCsvFile

* ADM-873:[backend]refactor: modify test info

* ADM-873:[backend]refactor: format code

---------

Co-authored-by: yulongcai <yulong.cai@thoughtworks.com>
Co-authored-by: Rui7ing <129819182+Rui7ing@users.noreply.github.com>
… returning from the metric page to the configuration page. (#1343)

* [feat][adm-811]: remove GoCD option

* [frontend][adm-811]: feat: remove clear config data trigger when back to config page

* [frontend][adm-811]: refact: refact unit test

* [frontend][adm-811]: replace fireEvent use userEvent

* [frontend][adm-811]: fix failed case
* ADM-910[docs] feat: add Node and Rate limits and calculate

* ADM-910[docs] feat: add flew chart for get data by github api
* ADM-912 feat: display date ranges

* ADM-912 test: add unit test

* ADM-912 fix: fix css

* ADM-912 fix: fix color

* ADM-912 fix: fix hex color

* ADM-912 fix: use color from theme
* ADM-912 feat: display date ranges

* ADM-912 test: add unit test

* ADM-912 fix: fix css

* ADM-912 fix: fix color

* ADM-912 fix: fix hex color

* ADM-912 fix: use color from theme

* ADM-912 fix: fix pipeline time
Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3 to 4.
- [Release notes](https://github.com/peaceiris/actions-gh-pages/releases)
- [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md)
- [Commits](peaceiris/actions-gh-pages@v3...v4)

---
updated-dependencies:
- dependency-name: peaceiris/actions-gh-pages
  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>
* ADM-890:[e2e] feat: flag as block test by token E2E_TOKEN_JIRA

* ADM-890:[e2e] refactor: remove useless E2E_TOKEN_FLAG_AS_BLOCK_JIRA

* ADM-890:[frontend] fix: fix lint issue
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 3.1.0 to 3.2.1.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](gradle/gradle-build-action@v3.1.0...v3.2.1)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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>
This reverts commit d92ca00.
* ADM-833: [frontend] feat: add unhappy path scenarios

* ADM-833: [frontend] fix: fix frontend unit test error

---------

Co-authored-by: YaoZhang-Daniel <zyao1987@163.com>
* ADM-833: [frontend] feat: add unhappy path scenarios

* ADM-833: [frontend] fix: fix frontend unit test error

* ADM-833: [frontend] fix: fix build-and-deploy.yml error

---------

Co-authored-by: YaoZhang-Daniel <zyao1987@163.com>
…s in metrics page (#1359)

* ADM-920:[backend] feat: can get all pipeline info

* ADM-920:[backend] fix: change Cache type
Co-authored-by: yulongcai <141199398+yulongcai@users.noreply.github.com>
Copy link

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

@davidwangcn9 davidwangcn9 merged commit 702cb41 into thoughtworks:main Apr 12, 2024
11 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.