feat(site): show license utilization in general settings #15683
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
johnstcn
reviewed
Nov 29, 2024
site/src/pages/DeploymentSettingsPage/GeneralSettingsPage/GeneralSettingsPageView.stories.tsx
Show resolved
Hide resolved
johnstcn
reviewed
Nov 29, 2024
Comment on lines
84
to
85
| {entitlements!.features.user_limit.actual}/ | ||
| {entitlements!.features.user_limit.limit} users) |
There was a problem hiding this comment.
Would it make sense to give these a similar treatment to licenseUtilizationPercentage and check if we can evaluate them based on whether entitlements is nil?
mafredri
reviewed
Nov 29, 2024
| entitlements?.features?.user_limit?.limit | ||
| ? entitlements.features.user_limit.actual / | ||
| entitlements.features.user_limit.limit | ||
| : undefined; |
There was a problem hiding this comment.
Suggestion: Instead of just doing the percentage here, we could prepare the data format in a more convenient way to use in the template:
const licenseInfo =
entitlements?.features?.user_limit?.actual &&
entitlements?.features?.user_limit?.limit
? {
valid: true,
actual: entitlements.features.user_limit.actual,
limit: entitlements.features.user_limit.limit
} : {
valid: false,
actual: 0,
limit: 0,
};Might not need to even init the actual/limit for the zero case but added it just in case.
BrunoQuaresma
approved these changes
Dec 2, 2024
There was a problem hiding this comment.
It looks good to me. Thanks for digging into the problem and finding the right solution.
One minor thing, that we can do after merge, is to improve the design a bit. cc.: @chrifro
aslilac
approved these changes
Dec 2, 2024
site/src/pages/DeploymentSettingsPage/GeneralSettingsPage/GeneralSettingsPageView.tsx
Outdated
Show resolved
Hide resolved
| @@ -42,6 +42,7 @@ const meta: Meta<typeof GeneralSettingsPageView> = { | |||
| deploymentDAUs: MockDeploymentDAUResponse, | |||
| invalidExperiments: [], | |||
| safeExperiments: [], | |||
| entitlements: undefined, | |||
There was a problem hiding this comment.
Suggested change
| entitlements: undefined, |
undefined is JavaScript's equivalent to a zero value, this doesn't do anything
…ralSettingsPageView.tsx Co-authored-by: ケイラ <mckayla@hey.com>
stirby
pushed a commit
that referenced
this pull request
Dec 2, 2024
This PR is the first iteration towards #15297 We cannot yet show license utilization over time, so we show current license utilization. This is because we don't track user states over time. We only track the current user state. A graph over time filtering by active users would therefore not account for day to day changes in user state and be inaccurate. DB schema migrations and related updates will follow that allow us to show license utilization over time.  --------- Co-authored-by: ケイラ <mckayla@hey.com> (cherry picked from commit 7e1ac2e)
stirby
added a commit
that referenced
this pull request
Dec 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is the first iteration towards #15297
We cannot yet show license utilization over time, so we show current license utilization.
This is because we don't track user states over time. We only track the current user state. A graph over time filtering by active users would therefore not account for day to day changes in user state and be inaccurate.
DB schema migrations and related updates will follow that allow us to show license utilization over time.