-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Minor: show metric granularity in smallest to largest order unit (#18638
- Loading branch information
1 parent
cefbdf0
commit 00fbf07
Showing
5 changed files
with
128 additions
and
12 deletions.
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
69 changes: 69 additions & 0 deletions
69
openmetadata-ui/src/main/resources/ui/src/utils/MetricEntityUtils/MetricUtils.test.ts
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 |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Copyright 2024 Collate. | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| import { UnitOfMeasurement } from '../../generated/entity/data/metric'; | ||
| import { getSortedOptions } from './MetricUtils'; | ||
|
|
||
| describe('getSortedOptions', () => { | ||
| it('should sort options by granularity order if valueKey is granularity', () => { | ||
| const options = [ | ||
| { label: 'Second', value: 'second', key: '1' }, | ||
| { label: 'Minute', value: 'minute', key: '2' }, | ||
| { label: 'Hour', value: 'hour', key: '3' }, | ||
| { label: 'Day', value: 'day', key: '4' }, | ||
| { label: 'Week', value: 'week', key: '5' }, | ||
| { label: 'Month', value: 'month', key: '6' }, | ||
| { label: 'Quarter', value: 'quarter', key: '7' }, | ||
| { label: 'Year', value: 'year', key: '8' }, | ||
| ]; | ||
| const value = 'day'; | ||
| const valueKey = 'granularity'; | ||
|
|
||
| const result = getSortedOptions(options, value, valueKey); | ||
|
|
||
| expect(result).toEqual([ | ||
| { label: 'Day', value: 'day', key: '4' }, | ||
| { label: 'Second', value: 'second', key: '1' }, | ||
| { label: 'Minute', value: 'minute', key: '2' }, | ||
| { label: 'Hour', value: 'hour', key: '3' }, | ||
| { label: 'Week', value: 'week', key: '5' }, | ||
| { label: 'Month', value: 'month', key: '6' }, | ||
| { label: 'Quarter', value: 'quarter', key: '7' }, | ||
| { label: 'Year', value: 'year', key: '8' }, | ||
| ]); | ||
| }); | ||
|
|
||
| it('should sort options by default order if valueKey is not granularity', () => { | ||
| const options = Object.values(UnitOfMeasurement).map( | ||
| (unitOfMeasurement) => ({ | ||
| key: unitOfMeasurement, | ||
| label: unitOfMeasurement, | ||
| value: unitOfMeasurement, | ||
| }) | ||
| ); | ||
| const value = 'SIZE'; | ||
| const valueKey = 'unitOfMeasurement'; | ||
|
|
||
| const result = getSortedOptions(options, value, valueKey); | ||
|
|
||
| expect(result).toEqual([ | ||
| { key: 'SIZE', label: 'SIZE', value: 'SIZE' }, | ||
| { key: 'COUNT', label: 'COUNT', value: 'COUNT' }, | ||
| { key: 'DOLLARS', label: 'DOLLARS', value: 'DOLLARS' }, | ||
| { key: 'EVENTS', label: 'EVENTS', value: 'EVENTS' }, | ||
| { key: 'PERCENTAGE', label: 'PERCENTAGE', value: 'PERCENTAGE' }, | ||
| { key: 'REQUESTS', label: 'REQUESTS', value: 'REQUESTS' }, | ||
| { key: 'TIMESTAMP', label: 'TIMESTAMP', value: 'TIMESTAMP' }, | ||
| { key: 'TRANSACTIONS', label: 'TRANSACTIONS', value: 'TRANSACTIONS' }, | ||
| ]); | ||
| }); | ||
| }); |
48 changes: 48 additions & 0 deletions
48
openmetadata-ui/src/main/resources/ui/src/utils/MetricEntityUtils/MetricUtils.ts
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 |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright 2024 Collate. | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| import { Metric, MetricGranularity } from '../../generated/entity/data/metric'; | ||
|
|
||
| const granularityOrder = [ | ||
| MetricGranularity.Second, | ||
| MetricGranularity.Minute, | ||
| MetricGranularity.Hour, | ||
| MetricGranularity.Day, | ||
| MetricGranularity.Week, | ||
| MetricGranularity.Month, | ||
| MetricGranularity.Quarter, | ||
| MetricGranularity.Year, | ||
| ]; | ||
|
|
||
| export const getSortedOptions = ( | ||
| options: { | ||
| label: string; | ||
| value: string; | ||
| key: string; | ||
| }[], | ||
| value: string | undefined, | ||
| valueKey: keyof Metric | ||
| ) => { | ||
| return options.sort((a, b) => { | ||
| if (a.value === value) { | ||
| return -1; | ||
| } | ||
| if (b.value === value) { | ||
| return 1; | ||
| } | ||
|
|
||
| return valueKey === 'granularity' | ||
| ? granularityOrder.indexOf(a.value as MetricGranularity) - | ||
| granularityOrder.indexOf(b.value as MetricGranularity) | ||
| : 0; | ||
| }); | ||
| }; |