@scality/core-ui 0.177.0 → 0.179.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/post-release.yml +7 -6
- package/dist/components/barchartv2/Barchart.component.d.ts +1 -1
- package/dist/components/barchartv2/Barchart.component.d.ts.map +1 -1
- package/dist/components/barchartv2/Barchart.component.js +6 -4
- package/dist/components/barchartv2/utils.d.ts.map +1 -1
- package/dist/components/barchartv2/utils.js +14 -3
- package/dist/components/charttooltip/ChartTooltip.js +2 -2
- package/dist/components/form/Form.component.d.ts.map +1 -1
- package/dist/components/form/Form.component.js +2 -2
- package/dist/components/globalhealthbar/components/HealthBarXAxis.d.ts.map +1 -1
- package/dist/components/globalhealthbar/components/HealthBarXAxis.js +2 -2
- package/dist/components/globalhealthbar/healthBarUtils.d.ts +1 -1
- package/dist/components/globalhealthbar/healthBarUtils.js +1 -1
- package/package.json +1 -1
- package/src/lib/components/barchartv2/Barchart.component.tsx +6 -4
- package/src/lib/components/barchartv2/utils.test.ts +2 -2
- package/src/lib/components/barchartv2/utils.ts +9 -2
- package/src/lib/components/charttooltip/ChartTooltip.tsx +2 -2
- package/src/lib/components/form/Form.component.tsx +2 -3
- package/src/lib/components/globalhealthbar/components/HealthBarXAxis.tsx +2 -1
- package/src/lib/components/globalhealthbar/healthBarUtils.ts +1 -1
|
@@ -12,7 +12,7 @@ jobs:
|
|
|
12
12
|
- name: Install node
|
|
13
13
|
uses: actions/setup-node@v2
|
|
14
14
|
with:
|
|
15
|
-
node-version:
|
|
15
|
+
node-version: "16"
|
|
16
16
|
- run: echo "nextVersion=$(npm version --no-git-tag minor)" >> $GITHUB_ENV
|
|
17
17
|
- name: Create Pull Request
|
|
18
18
|
uses: peter-evans/create-pull-request@v3
|
|
@@ -22,7 +22,7 @@ jobs:
|
|
|
22
22
|
branch: feature/bump-core-ui-version-to-${{ env.nextVersion }}
|
|
23
23
|
commit-message: Bump core-ui version to ${{ env.nextVersion }}
|
|
24
24
|
title: Bump core-ui version to ${{ env.nextVersion }}
|
|
25
|
-
body:
|
|
25
|
+
body: ""
|
|
26
26
|
base: ${{ github.event.repository.default_branch }}
|
|
27
27
|
- uses: actions/github-script@v5
|
|
28
28
|
if: ${{ steps.cpr.outputs.pull-request-number }}
|
|
@@ -37,16 +37,17 @@ jobs:
|
|
|
37
37
|
})
|
|
38
38
|
publish-npm:
|
|
39
39
|
runs-on: ubuntu-latest
|
|
40
|
+
permissions:
|
|
41
|
+
id-token: write # Required for OIDC authentication
|
|
42
|
+
contents: read
|
|
40
43
|
environment: npmjs
|
|
41
44
|
steps:
|
|
42
45
|
- uses: actions/checkout@v3
|
|
43
46
|
# Setup .npmrc file to publish to npmjs.org
|
|
44
47
|
- uses: actions/setup-node@v3
|
|
45
48
|
with:
|
|
46
|
-
node-version:
|
|
47
|
-
registry-url:
|
|
49
|
+
node-version: "25"
|
|
50
|
+
registry-url: "https://registry.npmjs.org"
|
|
48
51
|
- run: npm install
|
|
49
52
|
- run: npm run build
|
|
50
53
|
- run: npm publish
|
|
51
|
-
env:
|
|
52
|
-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
|
@@ -73,7 +73,7 @@ interface CustomTickProps {
|
|
|
73
73
|
}
|
|
74
74
|
/**
|
|
75
75
|
* Get the format of the date based on the duration
|
|
76
|
-
* @param duration - Duration in
|
|
76
|
+
* @param duration - Duration in seconds
|
|
77
77
|
* @returns Formatted string
|
|
78
78
|
*/
|
|
79
79
|
export declare const formatDate: (duration: number) => "time" | "day-month-abbreviated" | "chart-long-term-date";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Barchart.component.d.ts","sourceRoot":"","sources":["../../../src/lib/components/barchartv2/Barchart.component.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Barchart.component.d.ts","sourceRoot":"","sources":["../../../src/lib/components/barchartv2/Barchart.component.tsx"],"names":[],"mappings":"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"}
|
|
@@ -29,14 +29,14 @@ const maxWidthTooltip = { maxWidth: '20rem' };
|
|
|
29
29
|
/* ---------------------------------- COMPONENTS ---------------------------------- */
|
|
30
30
|
/**
|
|
31
31
|
* Get the format of the date based on the duration
|
|
32
|
-
* @param duration - Duration in
|
|
32
|
+
* @param duration - Duration in seconds
|
|
33
33
|
* @returns Formatted string
|
|
34
34
|
*/
|
|
35
35
|
export const formatDate = (duration) => {
|
|
36
|
-
if (duration <= 24 * 60 * 60
|
|
36
|
+
if (duration <= 24 * 60 * 60) {
|
|
37
37
|
return 'time';
|
|
38
38
|
}
|
|
39
|
-
else if (duration <= 7 * 24 * 60 * 60
|
|
39
|
+
else if (duration <= 7 * 24 * 60 * 60) {
|
|
40
40
|
return 'day-month-abbreviated';
|
|
41
41
|
}
|
|
42
42
|
else {
|
|
@@ -48,7 +48,9 @@ export const CustomTick = ({ x, y, payload, visibleTicksCount, width, type, }) =
|
|
|
48
48
|
const tickWidth = width / visibleTicksCount - CHART_CONSTANTS.TICK_WIDTH_OFFSET;
|
|
49
49
|
const centerX = x - tickWidth / 2;
|
|
50
50
|
const duration = type.type === 'time'
|
|
51
|
-
? type.timeRange.endDate.getTime() -
|
|
51
|
+
? (type.timeRange.endDate.getTime() -
|
|
52
|
+
type.timeRange.startDate.getTime()) /
|
|
53
|
+
1000
|
|
52
54
|
: 0;
|
|
53
55
|
return (_jsx("foreignObject", { x: centerX, y: y - 8, width: tickWidth, color: theme.textSecondary, overflow: "visible", children: _jsx(ConstrainedText, { color: "textSecondary", text: _jsx(Text, { variant: "Smaller", children: type.type === 'time' ? (_jsx(FormattedDateTime, { format: formatDate(duration), value: new Date(payload.value) })) : (String(payload.value)) }), centered: true, tooltipStyle: {
|
|
54
56
|
backgroundColor: theme.backgroundLevel1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/lib/components/barchartv2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAe,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAG7D,eAAO,MAAM,sBAAsB,UAAW,MAAM,KAAG,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/lib/components/barchartv2/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,14 +15,24 @@ export const getRoundReferenceValue = (value) => {
|
|
|
15
15
|
let result;
|
|
16
16
|
if (normalized <= 1)
|
|
17
17
|
result = magnitude;
|
|
18
|
+
else if (value > 10 && normalized <= 1.5)
|
|
19
|
+
result = 1.5 * magnitude;
|
|
18
20
|
else if (normalized <= 2)
|
|
19
21
|
result = 2 * magnitude;
|
|
22
|
+
else if (value > 10 && normalized <= 2.5)
|
|
23
|
+
result = 2.5 * magnitude;
|
|
24
|
+
else if (value > 10 && normalized <= 3)
|
|
25
|
+
result = 3 * magnitude;
|
|
20
26
|
else if (value > 10 && normalized <= 4)
|
|
21
27
|
result = 4 * magnitude;
|
|
22
28
|
else if (normalized <= 5)
|
|
23
29
|
result = 5 * magnitude;
|
|
24
|
-
else if (value > 10 && normalized <=
|
|
25
|
-
result =
|
|
30
|
+
else if (value > 10 && normalized <= 6)
|
|
31
|
+
result = 6 * magnitude;
|
|
32
|
+
else if (value > 10 && normalized <= 8)
|
|
33
|
+
result = 8 * magnitude;
|
|
34
|
+
else if (normalized <= 10)
|
|
35
|
+
result = 10 * magnitude;
|
|
26
36
|
else
|
|
27
37
|
result = 10 * magnitude;
|
|
28
38
|
return result;
|
|
@@ -36,7 +46,8 @@ export const getTicks = (topValue, isSymmetrical) => {
|
|
|
36
46
|
return [0, topValue];
|
|
37
47
|
}
|
|
38
48
|
}
|
|
39
|
-
const
|
|
49
|
+
const possibleTickNumbers = [4, 3];
|
|
50
|
+
const numberOfTicks = possibleTickNumbers.find((number) => topValue % (number - 1) === 0) || 2; // Default to 2 ticks if no match
|
|
40
51
|
const tickInterval = topValue / (numberOfTicks - 1);
|
|
41
52
|
const ticks = Array.from({ length: numberOfTicks }, (_, index) => index * tickInterval);
|
|
42
53
|
if (isSymmetrical) {
|
|
@@ -59,10 +59,10 @@ export const ChartTooltipSeparator = styled.div `
|
|
|
59
59
|
width: 100%;
|
|
60
60
|
`;
|
|
61
61
|
const getTooltipDateFormat = (duration) => {
|
|
62
|
-
if (duration <= 60 * 60
|
|
62
|
+
if (duration <= 60 * 60) {
|
|
63
63
|
return 'day-month-abbreviated-hour-minute-second';
|
|
64
64
|
}
|
|
65
|
-
else if (duration <= 7 * 24 * 60 * 60
|
|
65
|
+
else if (duration <= 7 * 24 * 60 * 60) {
|
|
66
66
|
return 'day-month-abbreviated-hour-minute';
|
|
67
67
|
}
|
|
68
68
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Form.component.d.ts","sourceRoot":"","sources":["../../../src/lib/components/form/Form.component.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAGlB,YAAY,EACZ,SAAS,EAKV,MAAM,OAAO,CAAC;AAKf,OAAO,EAAQ,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAKxD,QAAA,MAAM,kBAAkB,cAAc,CAAC;AACvC,QAAA,MAAM,YAAY,WAAW,CAAC;AAG9B,KAAK,SAAS,GAAG,IAAI,CACnB,kBAAkB,CAAC,eAAe,CAAC,EACnC,YAAY,GAAG,gBAAgB,CAChC,GAAG;IACF,QAAQ,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAChC,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,IAAI,CAAC,EAAE,QAAQ,CAAC;KACjB,CAAC;CACH,GAAG,SAAS,CAAC;AACd,KAAK,YAAY,GAAG;IAAE,MAAM,EAAE;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAA;CAAE,GAAG,SAAS,CAAC;AAyD5D,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;IACpC,SAAS,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACtC,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,QAAA,MAAM,SAAS,6GAWZ,cAAc,
|
|
1
|
+
{"version":3,"file":"Form.component.d.ts","sourceRoot":"","sources":["../../../src/lib/components/form/Form.component.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAGlB,YAAY,EACZ,SAAS,EAKV,MAAM,OAAO,CAAC;AAKf,OAAO,EAAQ,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAKxD,QAAA,MAAM,kBAAkB,cAAc,CAAC;AACvC,QAAA,MAAM,YAAY,WAAW,CAAC;AAG9B,KAAK,SAAS,GAAG,IAAI,CACnB,kBAAkB,CAAC,eAAe,CAAC,EACnC,YAAY,GAAG,gBAAgB,CAChC,GAAG;IACF,QAAQ,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAChC,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,IAAI,CAAC,EAAE,QAAQ,CAAC;KACjB,CAAC;CACH,GAAG,SAAS,CAAC;AACd,KAAK,YAAY,GAAG;IAAE,MAAM,EAAE;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAA;CAAE,GAAG,SAAS,CAAC;AAyD5D,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;IACpC,SAAS,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACtC,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,QAAA,MAAM,SAAS,6GAWZ,cAAc,4CAqGhB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,QAAQ,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IACxE,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,CAAC;AAEF,QAAA,MAAM,WAAW,wDAKd,gBAAgB,4CAmClB,CAAC;AAgGF,QAAA,MAAM,IAAI,4HAYT,CAAC;AASF,QAAA,MAAM,eAAe;;YANX,MAAM;eACH,OAAO;eACP,OAAO;CAWnB,CAAC;AAEF,OAAO,EACL,IAAI,EACJ,WAAW,EACX,SAAS,EACT,eAAe,EACf,kBAAkB,EAClB,YAAY,GACb,CAAC"}
|
|
@@ -56,7 +56,7 @@ const FormGroup = ({ direction = 'horizontal', label, id, labelHelpTooltip, cont
|
|
|
56
56
|
const ctxt = useContext(LabelContext);
|
|
57
57
|
if (!ctxt) {
|
|
58
58
|
//intentionaly breaking rules of hooks here
|
|
59
|
-
throw new Error('FormGroup cannot be used outside of
|
|
59
|
+
throw new Error('FormGroup cannot be used outside of FormSection');
|
|
60
60
|
}
|
|
61
61
|
const { maxLabelWidth, setMaxLabelWidth } = ctxt;
|
|
62
62
|
const requireMode = useContext(RequireModeContext);
|
|
@@ -72,7 +72,7 @@ const FormGroup = ({ direction = 'horizontal', label, id, labelHelpTooltip, cont
|
|
|
72
72
|
return currentMaxLabelWidth;
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
|
-
}, [labelRef]);
|
|
75
|
+
}, [labelRef, labelHelpTooltip, setMaxLabelWidth]);
|
|
76
76
|
const value = {
|
|
77
77
|
disabled: disabled || false,
|
|
78
78
|
error: error || undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HealthBarXAxis.d.ts","sourceRoot":"","sources":["../../../../src/lib/components/globalhealthbar/components/HealthBarXAxis.tsx"],"names":[],"mappings":"AAWA,UAAU,mBAAmB;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAiDD,eAAO,MAAM,cAAc,sCAGxB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"HealthBarXAxis.d.ts","sourceRoot":"","sources":["../../../../src/lib/components/globalhealthbar/components/HealthBarXAxis.tsx"],"names":[],"mappings":"AAWA,UAAU,mBAAmB;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAiDD,eAAO,MAAM,cAAc,sCAGxB,mBAAmB,4CA4BrB,CAAC"}
|
|
@@ -14,12 +14,12 @@ const CustomTick = ({ tickProps, startTimestamp, endTimestamp, }) => {
|
|
|
14
14
|
const edgeMargin = getEdgeMargin(index, visibleTicksCount, isDaySpan);
|
|
15
15
|
return (
|
|
16
16
|
// use coordinate to center the text
|
|
17
|
-
shouldShowLabel && (_jsx("g", { transform: `translate(${payload.coordinate},${y})`, children: _jsx("text", { textAnchor: "middle", dy:
|
|
17
|
+
shouldShowLabel && (_jsx("g", { transform: `translate(${payload.coordinate},${y})`, children: _jsx("text", { textAnchor: "middle", dy: 8, dx: edgeMargin, fontSize: fontSize.smaller, fill: theme.textSecondary, children: is7DaySpan ? (_jsx(FormattedDateTime, { format: "day-month-abbreviated-hour-minute", value: new Date(payload.value) })) : (_jsx(FormattedDateTime, { format: "time", value: new Date(payload.value) })) }) })));
|
|
18
18
|
};
|
|
19
19
|
export const HealthBarXAxis = ({ startTimestamp, endTimestamp, }) => {
|
|
20
20
|
const theme = useTheme();
|
|
21
21
|
const ticks = getTicks(startTimestamp, endTimestamp);
|
|
22
|
-
return (_jsx(XAxis, { allowDataOverflow: true, dataKey: "start", type: "number", domain: [startTimestamp, endTimestamp], tickSize: 5, minTickGap: 10, interval: 0, tick: (props) => {
|
|
22
|
+
return (_jsx(XAxis, { allowDataOverflow: true, dataKey: "start", type: "number", domain: [startTimestamp, endTimestamp], tickSize: 5, minTickGap: 10, height: 15, interval: 0, tick: (props) => {
|
|
23
23
|
return (_jsx(CustomTick, { tickProps: props, startTimestamp: startTimestamp, endTimestamp: endTimestamp }));
|
|
24
24
|
}, ticks: ticks, tickLine: { stroke: theme.textSecondary }, axisLine: false }));
|
|
25
25
|
};
|
package/package.json
CHANGED
|
@@ -113,15 +113,15 @@ interface CustomTickProps {
|
|
|
113
113
|
|
|
114
114
|
/**
|
|
115
115
|
* Get the format of the date based on the duration
|
|
116
|
-
* @param duration - Duration in
|
|
116
|
+
* @param duration - Duration in seconds
|
|
117
117
|
* @returns Formatted string
|
|
118
118
|
*/
|
|
119
119
|
export const formatDate = (
|
|
120
120
|
duration: number,
|
|
121
121
|
): 'time' | 'day-month-abbreviated' | 'chart-long-term-date' => {
|
|
122
|
-
if (duration <= 24 * 60 * 60
|
|
122
|
+
if (duration <= 24 * 60 * 60) {
|
|
123
123
|
return 'time';
|
|
124
|
-
} else if (duration <= 7 * 24 * 60 * 60
|
|
124
|
+
} else if (duration <= 7 * 24 * 60 * 60) {
|
|
125
125
|
return 'day-month-abbreviated';
|
|
126
126
|
} else {
|
|
127
127
|
return 'chart-long-term-date';
|
|
@@ -143,7 +143,9 @@ export const CustomTick = ({
|
|
|
143
143
|
|
|
144
144
|
const duration =
|
|
145
145
|
type.type === 'time'
|
|
146
|
-
? type.timeRange.endDate.getTime() -
|
|
146
|
+
? (type.timeRange.endDate.getTime() -
|
|
147
|
+
type.timeRange.startDate.getTime()) /
|
|
148
|
+
1000
|
|
147
149
|
: 0;
|
|
148
150
|
|
|
149
151
|
return (
|
|
@@ -772,8 +772,8 @@ describe('computeUnitLabelAndRoundReferenceValue', () => {
|
|
|
772
772
|
);
|
|
773
773
|
|
|
774
774
|
expect(result.unitLabel).toBe('B');
|
|
775
|
-
// 680 with buffer: 748 → rounds to
|
|
776
|
-
expect(result.roundReferenceValue).toBe(
|
|
775
|
+
// 680 with buffer: 748 → rounds to 800 (8 * 100, value > 10)
|
|
776
|
+
expect(result.roundReferenceValue).toBe(800);
|
|
777
777
|
expect(result.rechartsData).toEqual([
|
|
778
778
|
{ category: 'category1', success: 680 },
|
|
779
779
|
]);
|
|
@@ -21,10 +21,15 @@ export const getRoundReferenceValue = (value: number): number => {
|
|
|
21
21
|
let result: number;
|
|
22
22
|
|
|
23
23
|
if (normalized <= 1) result = magnitude;
|
|
24
|
+
else if (value > 10 && normalized <= 1.5) result = 1.5 * magnitude;
|
|
24
25
|
else if (normalized <= 2) result = 2 * magnitude;
|
|
26
|
+
else if (value > 10 && normalized <= 2.5) result = 2.5 * magnitude;
|
|
27
|
+
else if (value > 10 && normalized <= 3) result = 3 * magnitude;
|
|
25
28
|
else if (value > 10 && normalized <= 4) result = 4 * magnitude;
|
|
26
29
|
else if (normalized <= 5) result = 5 * magnitude;
|
|
27
|
-
else if (value > 10 && normalized <=
|
|
30
|
+
else if (value > 10 && normalized <= 6) result = 6 * magnitude;
|
|
31
|
+
else if (value > 10 && normalized <= 8) result = 8 * magnitude;
|
|
32
|
+
else if (normalized <= 10) result = 10 * magnitude;
|
|
28
33
|
else result = 10 * magnitude;
|
|
29
34
|
|
|
30
35
|
return result;
|
|
@@ -38,7 +43,9 @@ export const getTicks = (topValue: number, isSymmetrical: boolean) => {
|
|
|
38
43
|
return [0, topValue];
|
|
39
44
|
}
|
|
40
45
|
}
|
|
41
|
-
const
|
|
46
|
+
const possibleTickNumbers = [4, 3];
|
|
47
|
+
const numberOfTicks =
|
|
48
|
+
possibleTickNumbers.find((number) => topValue % (number - 1) === 0) || 2; // Default to 2 ticks if no match
|
|
42
49
|
const tickInterval = topValue / (numberOfTicks - 1);
|
|
43
50
|
const ticks = Array.from(
|
|
44
51
|
{ length: numberOfTicks },
|
|
@@ -109,9 +109,9 @@ export type TooltipDateFormat =
|
|
|
109
109
|
const getTooltipDateFormat: (duration: number) => TooltipDateFormat = (
|
|
110
110
|
duration: number,
|
|
111
111
|
) => {
|
|
112
|
-
if (duration <= 60 * 60
|
|
112
|
+
if (duration <= 60 * 60) {
|
|
113
113
|
return 'day-month-abbreviated-hour-minute-second';
|
|
114
|
-
} else if (duration <= 7 * 24 * 60 * 60
|
|
114
|
+
} else if (duration <= 7 * 24 * 60 * 60) {
|
|
115
115
|
return 'day-month-abbreviated-hour-minute';
|
|
116
116
|
} else {
|
|
117
117
|
return 'day-month-abbreviated-year-hour-minute';
|
|
@@ -131,10 +131,9 @@ const FormGroup = ({
|
|
|
131
131
|
disabled,
|
|
132
132
|
}: FormGroupProps) => {
|
|
133
133
|
const ctxt = useContext(LabelContext);
|
|
134
|
-
|
|
135
134
|
if (!ctxt) {
|
|
136
135
|
//intentionaly breaking rules of hooks here
|
|
137
|
-
throw new Error('FormGroup cannot be used outside of
|
|
136
|
+
throw new Error('FormGroup cannot be used outside of FormSection');
|
|
138
137
|
}
|
|
139
138
|
|
|
140
139
|
const { maxLabelWidth, setMaxLabelWidth } = ctxt;
|
|
@@ -151,7 +150,7 @@ const FormGroup = ({
|
|
|
151
150
|
return currentMaxLabelWidth;
|
|
152
151
|
});
|
|
153
152
|
}
|
|
154
|
-
}, [labelRef]);
|
|
153
|
+
}, [labelRef, labelHelpTooltip, setMaxLabelWidth]);
|
|
155
154
|
|
|
156
155
|
const value = {
|
|
157
156
|
disabled: disabled || false,
|
|
@@ -42,7 +42,7 @@ const CustomTick = ({
|
|
|
42
42
|
<g transform={`translate(${payload.coordinate},${y})`}>
|
|
43
43
|
<text
|
|
44
44
|
textAnchor="middle"
|
|
45
|
-
dy={
|
|
45
|
+
dy={8}
|
|
46
46
|
dx={edgeMargin}
|
|
47
47
|
fontSize={fontSize.smaller}
|
|
48
48
|
fill={theme.textSecondary}
|
|
@@ -76,6 +76,7 @@ export const HealthBarXAxis = ({
|
|
|
76
76
|
domain={[startTimestamp, endTimestamp]}
|
|
77
77
|
tickSize={5}
|
|
78
78
|
minTickGap={10}
|
|
79
|
+
height={15}
|
|
79
80
|
interval={0}
|
|
80
81
|
tick={(props: any) => {
|
|
81
82
|
return (
|