Merge develop to master #5899

yuda110 · 2025-05-30T07:38:16Z

Skip Review (optional)

Minor changes that don't affect the functionality (e.g. style, chore, ci, test, docs)
Previously reviewed in feature branch, further review is not mandatory
Self-merge allowed for solo developers or urgent changes

Description (optional)

Things to Talk About (optional)

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>

fix: fixed time bug

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>

feat: add column at service account attached general accounts table

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>

* fix: status bar visibility bug fix Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com> * fix: bug fix for missing domain Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com> --------- Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>

…5827) Signed-off-by: yuda <yuda@megazone.com>

Signed-off-by: yuda <yuda@megazone.com>

* feat: add vue query and mutation of `CostReport` Signed-off-by: yuda <yuda@megazone.com> * refactor: use VueQuery rather than SpaceConnector Signed-off-by: yuda <yuda@megazone.com> * fix: use `select` in `useCostReportConfigQuery` Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* chore: markup "cost report configuration" section Signed-off-by: yuda <yuda@megazone.com> * feat: update costReportConfig model Signed-off-by: yuda <yuda@megazone.com> * feat: add cost report config form handling and submission logic Signed-off-by: yuda <yuda@megazone.com> * chore: update language Signed-off-by: yuda <yuda@megazone.com> * chore: edit `CostReportConfigUpdateParameters` Signed-off-by: yuda <yuda@megazone.com> * fix: add `DOMAIN` scope to `costReportConfigApiHelper` Signed-off-by: yuda <yuda@megazone.com> * chore: delete console.log() Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* chore: edit type of props Signed-off-by: yuda <yuda@megazone.com> * feat: add 'Cost Report Adjustments' overlay Signed-off-by: yuda <yuda@megazone.com> * chore: update language Signed-off-by: yuda <yuda@megazone.com> * chore: update props type Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* feat: update model of report adjustment Signed-off-by: yuda <yuda@megazone.com> * feat: add api hook of report adjustment Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

Signed-off-by: yuda <yuda@megazone.com>

* refactor: move mutation logic from hook to page Signed-off-by: yuda <yuda@megazone.com> * chore: remove manage button from cost report page Signed-off-by: yuda <yuda@megazone.com> * feat: delete CostReportSettingsModal (deprecated) Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* feat: update adjustment model Signed-off-by: yuda <yuda@megazone.com> * feat: update adjustment model Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

…ge-store (#5850) * feat: add advanced-settings-page-store Signed-off-by: yuda <yuda@megazone.com> * refactor: separate component Signed-off-by: yuda <yuda@megazone.com> * feat: init adjustment data on overlay open Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* refactor: use vuequery rather than api list Signed-off-by: yuda <yuda@megazone.com> * feat: init workspace select dropdown Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* feat: implement `confirmation date` for report Signed-off-by: yuda <yuda@megazone.com> * chore: update language Signed-off-by: yuda <yuda@megazone.com> * chore: replace with helper Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* feat: add 'reissue' button Signed-off-by: yuda <yuda@megazone.com> * chore: update language Signed-off-by: yuda <yuda@megazone.com> * chore: delete invalidating query cache Signed-off-by: yuda <yuda@megazone.com> * fix: set proper return value Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* feat: add `input-left` slot to PTextInput Signed-off-by: yuda <yuda@megazone.com> * feat: set provider, adjustment select dropdown Signed-off-by: yuda <yuda@megazone.com> * chore: update language Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* feat: add `isAllWorkspaceSelected` to policy data Signed-off-by: yuda <yuda@megazone.com> * chore: update model Signed-off-by: yuda <yuda@megazone.com> * chore: show reissue button only on specific date Signed-off-by: yuda <yuda@megazone.com> * chore: edit adjustment valid condition Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* chore: edit model schema Signed-off-by: yuda <yuda@megazone.com> * feat: apply CRUD for Adjustment Policy Signed-off-by: yuda <yuda@megazone.com> * fix: fix query key Signed-off-by: yuda <yuda@megazone.com> * chore: add translate Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* chore: change unit from PERCENTAGE to PERCENT Signed-off-by: yuda <yuda@megazone.com> * chore: fix adjustment validation Signed-off-by: yuda <yuda@megazone.com> * chore: sort adjustments Signed-off-by: yuda <yuda@megazone.com> * feat: create/update/delete/change-order adjustment items Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* fix: fix promise bug when save adjustments Signed-off-by: yuda <yuda@megazone.com> * chore: sort with order Signed-off-by: yuda <yuda@megazone.com> * chore: do not raise api when there's no change Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

* chore: update model type Signed-off-by: yuda <yuda@megazone.com> * chore: set updated spec Signed-off-by: yuda <yuda@megazone.com> * feat: update cost report detail page Signed-off-by: yuda <yuda@megazone.com> * chore: update language Signed-off-by: yuda <yuda@megazone.com> * chore: edit minor style Signed-off-by: yuda <yuda@megazone.com> * chore: delete console.log Signed-off-by: yuda <yuda@megazone.com> * chore: update minor style Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

Signed-off-by: yuda <yuda@megazone.com>

* feat: update provider section Signed-off-by: yuda <yuda@megazone.com> * chore: set sorting Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

Signed-off-by: yuda <yuda@megazone.com>

* feat: add sync-currency API scheme Signed-off-by: yuda <yuda@megazone.com> * feat: add 'Sync exchange rate' button Signed-off-by: yuda <yuda@megazone.com> * chore: update language Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

Signed-off-by: samuel.park <samuel.park@megazone.com>

…posable Signed-off-by: samuel.park <samuel.park@megazone.com>

…pagination query Signed-off-by: samuel.park <samuel.park@megazone.com>

Signed-off-by: samuel.park <samuel.park@megazone.com>

…ble and `pagination` flag to `useServiceQueryKey` feat(use-pagination-query): create `useScopedPaginationQuery` composable and `pagination` flag to `useServiceQueryKey`

feat: merge feature-cost-report

vercel · 2025-05-30T07:38:18Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
console	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	May 30, 2025 7:44am
cost-report	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	May 30, 2025 7:44am
web-storybook	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	May 30, 2025 7:44am

github-actions · 2025-05-30T07:38:27Z

⚠️ @yuda110 the signed-off-by was not found in the following 4 commits:

13b8386: chore: merge master into develop after 2.0.dev361 version tagging
4a3c1b6: Merge pull request fix: fixed time bug #5870 from skdud4659/feature/req
6997ff3: Merge pull request feat: add column at service account attached general accounts table #5873 from skdud4659/feature/bug
140d19f: chore: merge master into develop after 2.0.dev362 version tagging

✅ Why it is required

The Developer Certificate of Origin (DCO) is a lightweight way for contributors to certify that they wrote or otherwise have the right to submit the code they are contributing to the project. Here is the full text of the DCO.

Contributors sign-off that they adhere to these requirements by adding a Signed-off-by line to commit messages.

This is my commit message

Signed-off-by: Random Developer <randomdeveloper@example.com>

Git even has a -s command line option to append this automatically to your commit message:

$ git commit -s -m 'This is my commit message'

github-actions · 2025-05-30T07:38:28Z

🎉 @seungyeoneeee has been randomly selected as the reviewer! Please review. 🙏

github-actions · 2025-05-30T07:38:33Z

✅ There are no commits in this PR that require review.

admin-cloudforet and others added 30 commits May 21, 2025 04:40

chore: merge master into develop after 2.0.dev361 version tagging

13b8386

fix: fixed time bug

cd267e4

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>

Merge pull request #5870 from skdud4659/feature/req

4a3c1b6

fix: fixed time bug

feat: add filed at service account attached general accounts table

7d233c1

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>

Merge pull request #5873 from skdud4659/feature/bug

6997ff3

feat: add column at service account attached general accounts table

chore: merge master into develop after 2.0.dev362 version tagging

140d19f

fix: status bar visibility bug fix

b7143e7

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>

fix: bug fix for missing domain

3d16634

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>

fix: apply minor feedback (#5891)

a3b0c05

* fix: status bar visibility bug fix Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com> * fix: bug fix for missing domain Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com> --------- Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>

chore: remove subpages and display all components in the parent page (#…

b2e16aa

…5827) Signed-off-by: yuda <yuda@megazone.com>

chore: change structure of admin advanced settings page (#5834)

ec05dd9

Signed-off-by: yuda <yuda@megazone.com>

feat: update model of report adjustment (#5843)

d5be600

* feat: update model of report adjustment Signed-off-by: yuda <yuda@megazone.com> * feat: add api hook of report adjustment Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

chore: markup adjustment form (#5844)

84185ee

Signed-off-by: yuda <yuda@megazone.com>

feat: update adjustment model (#5849)

16f6847

* feat: update adjustment model Signed-off-by: yuda <yuda@megazone.com> * feat: update adjustment model Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

refactor: use vuequery rather than api list (#5856)

af5acb8

* refactor: use vuequery rather than api list Signed-off-by: yuda <yuda@megazone.com> * feat: init workspace select dropdown Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

feat: apply adjustment to report detail page (#5887)

f027558

Signed-off-by: yuda <yuda@megazone.com>

feat: set sort(created_at/asc) to cost-report-config/list (#5889)

439e1aa

Signed-off-by: yuda <yuda@megazone.com>

yuda110 and others added 10 commits May 29, 2025 10:47

refactor: refactor code (#5890)

4d8c847

Signed-off-by: yuda <yuda@megazone.com>

feat: update provider section (#5892)

e8c4503

* feat: update provider section Signed-off-by: yuda <yuda@megazone.com> * chore: set sorting Signed-off-by: yuda <yuda@megazone.com> --------- Signed-off-by: yuda <yuda@megazone.com>

fix: fix adjustment addition error (#5893)

16e0b26

Signed-off-by: yuda <yuda@megazone.com>

feat(scoped-infinite-query): create useScopedInfiniteQuery composable

0398546

Signed-off-by: samuel.park <samuel.park@megazone.com>

fix(service-query-key): add pagination flag to useServiceQueryKey com…

a0b9a2c

…posable Signed-off-by: samuel.park <samuel.park@megazone.com>

feat(use-pagination-query): create usePaginationQuery composable for …

32909b0

…pagination query Signed-off-by: samuel.park <samuel.park@megazone.com>

chore: add pagination segment

6f04e62

Signed-off-by: samuel.park <samuel.park@megazone.com>

feat(use-pagination-query): create useScopedPaginationQuery composa…

6aaf9e0

…ble and `pagination` flag to `useServiceQueryKey` feat(use-pagination-query): create `useScopedPaginationQuery` composable and `pagination` flag to `useServiceQueryKey`

Merge pull request #5898 from cloudforet-io/feature-cost-report

b12470c

feat: merge feature-cost-report

vercel bot deployed to Production – web-storybook May 30, 2025 07:38 View deployment

github-actions bot added the fail/signedoff label May 30, 2025

github-actions bot requested a review from seungyeoneeee May 30, 2025 07:38

github-actions bot assigned yuda110 May 30, 2025

vercel bot deployed to Preview – cost-report May 30, 2025 07:41 View deployment

vercel bot deployed to Preview – console May 30, 2025 07:44 View deployment

yuda110 merged commit 110276e into master Jun 2, 2025
15 of 19 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop to master #5899

Merge develop to master #5899

Uh oh!

yuda110 commented May 30, 2025

Uh oh!

vercel bot commented May 30, 2025 •

edited

Loading

Uh oh!

github-actions bot commented May 30, 2025

Uh oh!

github-actions bot commented May 30, 2025

Uh oh!

github-actions bot commented May 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Merge develop to master #5899

Merge develop to master #5899

Uh oh!

Conversation

yuda110 commented May 30, 2025

Skip Review (optional)

Description (optional)

Things to Talk About (optional)

Uh oh!

vercel bot commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented May 30, 2025

✅ Why it is required

Uh oh!

github-actions bot commented May 30, 2025

Uh oh!

github-actions bot commented May 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

vercel bot commented May 30, 2025 •

edited

Loading