-
Notifications
You must be signed in to change notification settings - Fork 247
fix: remove several source change forms throughout the log drawer #730
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
38f2058
fix: remove several source change forms throughout the log drawer
knudtty 5cca268
Merge branch 'v2' into aaron/source-edit-refinement
knudtty 5cb3567
Merge branch 'v2' into aaron/source-edit-refinement
knudtty a512b74
Merge branch 'v2' into aaron/source-edit-refinement
knudtty f1fb57c
Merge branch 'v2' into aaron/source-edit-refinement
knudtty 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@hyperdx/app": patch | ||
--- | ||
|
||
36c3edc fix: remove several source change forms throughout the log drawer |
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,7 +4,6 @@ import { useForm } from 'react-hook-form'; | |
import { tcFromSource } from '@hyperdx/common-utils/dist/metadata'; | ||
import { SourceKind } from '@hyperdx/common-utils/dist/types'; | ||
import { | ||
ActionIcon, | ||
Button, | ||
Center, | ||
Divider, | ||
|
@@ -14,15 +13,13 @@ import { | |
Stack, | ||
Text, | ||
} from '@mantine/core'; | ||
import { useDisclosure } from '@mantine/hooks'; | ||
|
||
import { DBTraceWaterfallChartContainer } from '@/components/DBTraceWaterfallChart'; | ||
import { useSource, useUpdateSource } from '@/source'; | ||
import TabBar from '@/TabBar'; | ||
|
||
import { RowDataPanel } from './DBRowDataPanel'; | ||
import { RowOverviewPanel } from './DBRowOverviewPanel'; | ||
import { TableSourceForm } from './SourceForm'; | ||
import { SourceSelectControlled } from './SourceSelect'; | ||
import { SQLInlineEditorControlled } from './SQLInlineEditor'; | ||
|
||
|
@@ -103,22 +100,6 @@ export default function DBTracePanel({ | |
}, [parentSourceData?.traceIdExpression, traceIdSetValue]); | ||
|
||
const [showTraceIdInput, setShowTraceIdInput] = useState(false); | ||
const [showSourceForm, setShowSourceForm] = useState(false); | ||
useEffect(() => { | ||
if ( | ||
isTraceSourceLoading == false && | ||
(traceSourceData == null || | ||
traceSourceData?.kind == 'log' || | ||
traceSourceData?.durationExpression == null) | ||
) { | ||
setShowSourceForm(true); | ||
} | ||
}, [showSourceForm, traceSourceData, isTraceSourceLoading]); | ||
|
||
const [ | ||
sourceFormModalOpened, | ||
{ open: openSourceFormModal, close: closeSourceFormModal }, | ||
] = useDisclosure(false); | ||
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. All solely related to opening/closing source form |
||
|
||
// Reset highlighted row when trace ID changes | ||
// otherwise we'll show stale span details | ||
|
@@ -155,19 +136,6 @@ export default function DBTracePanel({ | |
: 'Correlated Log Source'} | ||
</Text> | ||
<SourceSelectControlled control={control} name="source" size="xs" /> | ||
<ActionIcon | ||
variant="subtle" | ||
color="dark.2" | ||
size="sm" | ||
onClick={ | ||
sourceFormModalOpened ? closeSourceFormModal : openSourceFormModal | ||
} | ||
title="Edit Source" | ||
> | ||
<Text size="xs"> | ||
<i className="bi bi-gear" /> | ||
</Text> | ||
</ActionIcon> | ||
</Group> | ||
</Flex> | ||
{(showTraceIdInput || !traceId) && parentSourceId != null && ( | ||
|
@@ -214,7 +182,6 @@ export default function DBTracePanel({ | |
</Stack> | ||
)} | ||
<Divider my="sm" /> | ||
{sourceFormModalOpened && <TableSourceForm sourceId={watch('source')} />} | ||
{traceSourceData?.kind === SourceKind.Trace && ( | ||
<DBTraceWaterfallChartContainer | ||
traceTableSource={traceSourceData} | ||
|
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.
sourceId was only used for the TableSourceForm