Skip to content

Commit 9b9496f

Browse files
committed
fix: better ui for enabled tools (no duration group if timestamp only)
1 parent 512692b commit 9b9496f

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

src/components/MainLayout/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ const Container = styled("div")(({ themeColors, width }) => ({
1717
display: "flex",
1818
flexDirection: "column",
1919
backgroundColor: themeColors.bg,
20+
padding: 16,
21+
boxSizing: "border-box",
2022
}))
2123

2224
const defaultEnabledTools = [

src/components/ReactTimeSeries/index.js

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,15 @@ export const ReactTimeSeriesWithoutContext = ({
105105

106106
const durationGroups = useMemo(() => {
107107
if (!annotation?.durations)
108-
return [
109-
{
110-
color: "#888888",
111-
misc: true,
112-
durations: [],
113-
},
114-
]
108+
return !enabledTools.includes("create-durations")
109+
? []
110+
: [
111+
{
112+
color: "#888888",
113+
misc: true,
114+
durations: [],
115+
},
116+
]
115117

116118
const availableLabels = Array.from(
117119
new Set(
@@ -138,15 +140,18 @@ export const ReactTimeSeriesWithoutContext = ({
138140
})
139141
.filter((dg) => dg.durations.length > 0)
140142

141-
durationGroups.push({
142-
color: "#888888",
143-
misc: true,
144-
durations: durationGroups
145-
.filter((dg) => dg.durations.length === 1)
146-
.flatMap((dg) => dg.durations)
147-
.concat(annotation.durations.filter((d) => !d.label))
148-
.map((d) => ({ ...d, color: getRandomColorUsingHash(d.label) })),
149-
})
143+
if (enabledTools.includes("create-durations")) {
144+
durationGroups.push({
145+
color: "#888888",
146+
misc: true,
147+
durations: durationGroups
148+
.filter((dg) => dg.durations.length === 1)
149+
.flatMap((dg) => dg.durations)
150+
.concat(annotation.durations.filter((d) => !d.label))
151+
.map((d) => ({ ...d, color: getRandomColorUsingHash(d.label) })),
152+
})
153+
}
154+
150155
durationGroups = durationGroups.filter(
151156
(dg) => dg.misc || dg.durations.length > 1
152157
)
@@ -155,6 +160,8 @@ export const ReactTimeSeriesWithoutContext = ({
155160
// eslint-disable-next-line
156161
}, [annotation?.durations])
157162

163+
console.log({ durationGroups })
164+
158165
const onChangeDurationGroups = useEventCallback((newDurationGroups) => {
159166
onModifySample(
160167
setIn(

0 commit comments

Comments
 (0)