feat: workspace info admin page #30434
Merged
Conversation
This file contains 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
🦋 Changeset detectedLatest commit: 1a630f2 The changes in this PR will be included in the next version bump. This PR includes changesets to release 30 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Codecov Report
@@ Coverage Diff @@
## develop #30434 +/- ##
===========================================
- Coverage 51.32% 51.04% -0.29%
===========================================
Files 816 815 -1
Lines 15120 15298 +178
Branches 2753 2843 +90
===========================================
+ Hits 7761 7809 +48
- Misses 6951 7048 +97
- Partials 408 441 +33
Flags with carried forward coverage won't be shown. Click here to find out more. |
hugocostadev
force-pushed
the
feature/info-page-overview-cards
branch
from
010c403 to
4409dec
Compare
aleksandernsilva
previously approved these changes
Oct 19, 2023
hugocostadev
dismissed stale reviews from aleksandernsilva, sampaiodiego, and dougfabris
via
6ca2f66
hugocostadev
requested review from
aleksandernsilva,
sampaiodiego and
dougfabris
KevLehman
requested changes
Oct 24, 2023
ggazzo
reviewed
Oct 31, 2023
| key: React.Key; | ||
| }; | ||
|
|
||
| const VersionCardActionItem = ({ key, actionItem }: VersionCardActionItemProps): ReactElement => { |
There was a problem hiding this comment.
key is a reserved prop this is not going to be passed
| }; | ||
|
|
||
| const VersionCardActionItemList = ({ actionItems }: VersionCardActionItemListProps) => { | ||
| return actionItems ? ( |
There was a problem hiding this comment.
there is no need to test it here
| const getActionItems = useCallback(() => { | ||
| const items: VersionActionItem[] = []; | ||
| let btn; | ||
| const isOverLimits = limits ? isOverLicenseLimits(limits) : false; |
There was a problem hiding this comment.
Suggested change
| const isOverLimits = limits ? isOverLicenseLimits(limits) : false; | |
| const isOverLimits = limits && isOverLicenseLimits(limits); |
Comment on lines
11
to
22
| export const isOverLicenseLimits = (limits: Limits): boolean => { | ||
| for (const key in limits) { | ||
| if (Object.hasOwn(limits, key)) { | ||
| const limit = limits[key as keyof Limits]; | ||
| if (limit.value !== undefined && limit.value > limit.max) { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| }; |
There was a problem hiding this comment.
Suggested change
| export const isOverLicenseLimits = (limits: Limits): boolean => { | |
| for (const key in limits) { | |
| if (Object.hasOwn(limits, key)) { | |
| const limit = limits[key as keyof Limits]; | |
| if (limit.value !== undefined && limit.value > limit.max) { | |
| return true; | |
| } | |
| } | |
| } | |
| return false; | |
| }; | |
| export const isOverLicenseLimits = (limits: Limits): boolean => | |
| Object.values(limits).some((limit) => limit.value !== undefined && limit.value > limit.max); |
| label: <Trans i18nKey='Plan_limits_reached' />, | ||
| }); | ||
|
|
||
| btn = { path: '/admin/manage-subscription', label: <Trans i18nKey='Manage_subscription' /> }; |
There was a problem hiding this comment.
Suggested change
| btn = { path: '/admin/manage-subscription', label: <Trans i18nKey='Manage_subscription' /> }; | |
| btn = { path: '/admin/subscription', label: <Trans i18nKey='Manage_subscription' /> }; |
Comment on lines
24
to
26
| if (path.startsWith('http')) { | ||
| return window.open(path, '_blank'); | ||
| } |
There was a problem hiding this comment.
I dont think this is the best way to choose if it opens in a new one or not
Comment on lines
28
to
31
| if (path === 'modal#registerWorkspace') { | ||
| handleRegisterWorkspaceClick(); | ||
| return; | ||
| } |
There was a problem hiding this comment.
it doenst look like a generic component to me
ggazzo
approved these changes
Oct 31, 2023
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.
NBJ-356
Proposed changes (including videos or screenshots)
New Workspace status page in place of Information Page
Changes:
Front-end:
infofolder toworkspaceStatususeUpgradeParams.tshook to fit to V3 license structureworkspaceroute toworkspace-statusroute and created a fallback for mobile app to still work underinfopathnameBoxcomponent props toCardcomponents to give more flexibility on styling card elements due to design specsBoxcomponent props toExternalLinkcomponent to give more flexibility on styling due to design specsFramedIconcomponent inui-clientpackage, should be moved to fuselage in the futureexpect download info as JSONe2e testuseWorkspaceInfo.tshook that joins all queries necessary forworkspace-statuspage (queries: statistics, instances.get, info)useLicense.tshook to use the newlicense.infoendpointisOverLicenseLimitsutil function to check if the license went over the license limitsBack-end:
IWorkspaceInfotype tocore-typingspackagegetServerInfo.tsfunctionstatistics.totalDiscussionsMessagesproperty to IStatsTODO:
Issue(s)
Steps to test or reproduce
Further comments