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.

Sign up for GitHub

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

Jump to bottom

feat(xo-server/resourceSet): add 'usage' property resourceSet #7353

Merged
merged 12 commits into from
Feb 28, 2024
Merged

feat(xo-server/resourceSet): add 'usage' property resourceSet #7353

merged 12 commits into from
Feb 28, 2024

Conversation

MathieuRA
Copy link
Member

@MathieuRA MathieuRA commented Feb 1, 2024 •
edited
Loading

Description

See zammad#20996
Show used resources even when they are unlimited
Screenshot from 2024-02-05 10-26-32

Checklist

  • Commit
    • Title follows commit conventions
    • Reference the relevant issue (Fixes #007, See xoa-support#42, See https://...)
    • If bug fix, add Introduced by
  • Changelog
    • If visible by XOA users, add changelog entry
    • Update "Packages to release" in CHANGELOG.unreleased.md
  • PR
    • If UI changes, add screenshots
    • If not finished or not tested, open as Draft

@MathieuRA MathieuRA force-pushed the xo5/resourceSet-usage branch from cddfab1 to f1ae632 Compare February 1, 2024 20:05
@julien-f julien-f removed their request for review February 5, 2024 10:03
julien-f
julien-f reviewed Feb 5, 2024
View reviewed changes
Copy link
Member

@julien-f julien-f left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase on top of master to fix CI.

@MathieuRA MathieuRA removed the request for review from julien-f February 5, 2024 15:26
MathieuRA
MathieuRA commented Feb 5, 2024
View reviewed changes
CHANGELOG.unreleased.md Outdated Show resolved Hide resolved
@MathieuRA
Copy link
Member Author

Good for me.

@MathieuRA MathieuRA requested a review from julien-f February 5, 2024 15:45
@MathieuRA MathieuRA requested a review from julien-f February 7, 2024 09:34
julien-f
julien-f reviewed Feb 8, 2024
View reviewed changes
Copy link
Member

@julien-f julien-f left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase on master.

@MathieuRA MathieuRA force-pushed the xo5/resourceSet-usage branch from 36e5d0c to e23ff07 Compare February 9, 2024 09:41
@julien-f julien-f requested a review from pdonias February 20, 2024 13:30
julien-f
julien-f approved these changes Feb 20, 2024
View reviewed changes
Copy link
Member

@julien-f julien-f left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the server side.

pdonias
pdonias requested changes Feb 23, 2024
View reviewed changes
CHANGELOG.unreleased.md Outdated Show resolved Hide resolved
packages/xo-web/src/common/resource-set-quotas.js Outdated Show resolved Hide resolved
@MathieuRA MathieuRA requested a review from pdonias February 28, 2024 08:35
@pdonias pdonias merged commit 71991d7 into master Feb 28, 2024
1 check passed
@pdonias pdonias deleted the xo5/resourceSet-usage branch February 28, 2024 13:40
pdonias added a commit that referenced this pull request Aug 1, 2024
@pdonias
fix(xo-web/self): remove unit in CPU usage total count
e09bc5c 
Introduced by #7353
@pdonias pdonias mentioned this pull request Aug 1, 2024
Merged
MathieuRA pushed a commit that referenced this pull request Aug 6, 2024
@pdonias
fix(xo-web/self): remove unit in CPU usage total count (#7894)
e750a66 
Introduced by #7353
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pdonias pdonias pdonias approved these changes

@julien-f julien-f julien-f approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MathieuRA @julien-f @pdonias @MelissaFrncJrg