-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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
Improve aggregate footer cell display #9124
Merged
Merged
Changes from 10 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
8918d05
feat: hide empty record group default true
magrinj edc1c4c
Merge branch 'main' into feat/hide-empty-record-group
charlesBochet 14a75d5
Fix re-render view groups
charlesBochet f9c4c74
Merge branch 'main' of github.com:twentyhq/twenty into fix-re-render-…
ijreilly 0c327bb
Fix unsused recordTableId
ijreilly c303b79
Make footer sticky
ijreilly 0859d50
Improve display of aggregate values
ijreilly 7a9a4d9
Revert "feat: hide empty record group default true"
ijreilly 9d524d6
Revert "Fix re-render view groups"
ijreilly fe6bcc3
Fix issue at sign in before initialization
ijreilly e4a8246
revert changes from previous PR
ijreilly b2553ad
Fix merge
ijreilly 7982a4b
revert scrollWrapper
ijreilly 822e4e5
Merge branch 'main' of github.com:twentyhq/twenty into fix-re-render-…
ijreilly 81a20c8
Fix stickiness
ijreilly a8d97b5
Rename Components + fix tests
ijreilly e5d2c12
Merge branch 'main' of github.com:twentyhq/twenty into fix-re-render-…
ijreilly 9a488d5
Merge branch 'main' of github.com:twentyhq/twenty into fix-re-render-…
ijreilly File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,8 @@ import { getAggregateOperationLabel } from '@/object-record/record-board/record- | |
import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations'; | ||
import isEmpty from 'lodash.isempty'; | ||
import { FieldMetadataType } from '~/generated-metadata/graphql'; | ||
import { formatAmount } from '~/utils/format/formatAmount'; | ||
import { formatNumber } from '~/utils/format/number'; | ||
import { isDefined } from '~/utils/isDefined'; | ||
|
||
export const computeAggregateValueAndLabel = ({ | ||
|
@@ -42,18 +44,40 @@ export const computeAggregateValueAndLabel = ({ | |
|
||
const aggregateValue = data[field.name]?.[aggregateOperation]; | ||
|
||
const value = | ||
isDefined(aggregateValue) && field.type === FieldMetadataType.Currency | ||
? Number(aggregateValue) / 1_000_000 | ||
: aggregateValue; | ||
let value; | ||
|
||
const label = | ||
if (aggregateOperation === AGGREGATE_OPERATIONS.count) { | ||
value = aggregateValue; | ||
} else if (!isDefined(aggregateValue)) { | ||
value = '-'; | ||
Comment on lines
+51
to
+52
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. style: consider using null instead of '-' to maintain consistent typing across the codebase |
||
} else { | ||
value = Number(aggregateValue); | ||
|
||
switch (field.type) { | ||
case FieldMetadataType.Currency: { | ||
value = formatAmount(value / 1_000_000); | ||
break; | ||
} | ||
|
||
case FieldMetadataType.Number: { | ||
const { decimals, type } = field.settings ?? {}; | ||
value = | ||
type === 'percentage' | ||
? `${formatNumber(value * 100, decimals)}%` | ||
: formatNumber(value, decimals); | ||
break; | ||
} | ||
} | ||
} | ||
const label = getAggregateOperationLabel(aggregateOperation); | ||
const labelWithFieldName = | ||
aggregateOperation === AGGREGATE_OPERATIONS.count | ||
? `${getAggregateOperationLabel(AGGREGATE_OPERATIONS.count)}` | ||
: `${getAggregateOperationLabel(aggregateOperation)} of ${field.name}`; | ||
|
||
return { | ||
value, | ||
label, | ||
labelWithFieldName, | ||
}; | ||
}; |
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
logic: removing formatNumber() means numbers won't be properly formatted (e.g. 1000000 will show as '1000000' instead of '1M' or '1,000,000'). Consider keeping number formatting for better readability