Skip to content

Commit

Permalink
chore(editor-3001): reorg buttons (PostHog#28960)
Browse files Browse the repository at this point in the history
  • Loading branch information
@EDsCODE
EDsCODE authored Feb 20, 2025
1 parent cf44692 commit 5b5ec0e
Show file tree
Hide file tree
Showing 7 changed files with 180 additions and 176 deletions.
12 changes: 8 additions & 4 deletions frontend/src/queries/nodes/DataVisualization/Components/Variables/AddVariableButton.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IconGear, IconPlus } from '@posthog/icons'
import { LemonButton, LemonMenu } from '@posthog/lemon-ui'
import { LemonButton, LemonButtonProps, LemonMenu } from '@posthog/lemon-ui'
import { useActions, useValues } from 'kea'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
Expand All @@ -9,7 +9,11 @@ import { NewVariableModal } from './NewVariableModal'
import { variableModalLogic } from './variableModalLogic'
import { variablesLogic } from './variablesLogic'

export const AddVariableButton = (): JSX.Element => {
export const AddVariableButton = ({
buttonProps,
}: {
buttonProps?: Pick<LemonButtonProps, 'type' | 'size' | 'sideIcon'>
}): JSX.Element => {
const { showEditingUI } = useValues(dataVisualizationLogic)
const { featureFlags } = useValues(featureFlagLogic)
const { openNewVariableModal, openExistingVariableModal } = useActions(variableModalLogic)
Expand Down Expand Up @@ -80,8 +84,8 @@ export const AddVariableButton = (): JSX.Element => {
},
]}
>
<LemonButton type="secondary" sideIcon={<IconPlus />}>
Add variable
<LemonButton type="secondary" icon={<IconPlus />} sideIcon={null} {...buttonProps}>
Query variable
</LemonButton>
</LemonMenu>
<NewVariableModal />
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/queries/nodes/DataVisualization/Components/Variables/Variables.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,11 @@ const VariableComponent = ({
<div>
<LemonField.Pure
label={variable.name}
className="gap-0"
className="gap-0 text-xs"
info={`Use this variable in your HogQL by referencing {variables.${variable.code_name}}`}
>
<LemonButton
size="xsmall"
type="secondary"
className="min-w-32 DataVizVariable_Button"
onClick={() => setPopoverOpen(!isPopoverOpen)}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/scenes/data-warehouse/editor/DataGrid.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.rdg-cell {
font-size: 0.75rem;
border-block-end: 1px solid var(--border);
border-inline-end: 1px solid var(--border);
}
Expand Down
111 changes: 26 additions & 85 deletions frontend/src/scenes/data-warehouse/editor/OutputPane.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import DataGrid, { CellClickArgs } from 'react-data-grid'
import { InsightErrorState, StatelessInsightLoadingState } from 'scenes/insights/EmptyStates'
import { HogQLBoldNumber } from 'scenes/insights/views/BoldNumber/BoldNumber'

import { KeyboardShortcut } from '~/layout/navigation-3000/components/KeyboardShortcut'
import { themeLogic } from '~/layout/navigation-3000/themeLogic'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { ElapsedTime } from '~/queries/nodes/DataNode/ElapsedTime'
Expand All @@ -23,15 +22,11 @@ import { LineGraph } from '~/queries/nodes/DataVisualization/Components/Charts/L
import { SideBar } from '~/queries/nodes/DataVisualization/Components/SideBar'
import { Table } from '~/queries/nodes/DataVisualization/Components/Table'
import { TableDisplay } from '~/queries/nodes/DataVisualization/Components/TableDisplay'
import { AddVariableButton } from '~/queries/nodes/DataVisualization/Components/Variables/AddVariableButton'
import { VariablesForInsight } from '~/queries/nodes/DataVisualization/Components/Variables/Variables'
import { variablesLogic } from '~/queries/nodes/DataVisualization/Components/Variables/variablesLogic'
import { DataTableVisualizationProps } from '~/queries/nodes/DataVisualization/DataVisualization'
import { dataVisualizationLogic } from '~/queries/nodes/DataVisualization/dataVisualizationLogic'
import { HogQLQueryResponse } from '~/queries/schema/schema-general'
import { ChartDisplayType, ExporterFormat } from '~/types'

import { dataWarehouseViewsLogic } from '../saved_queries/dataWarehouseViewsLogic'
import { multitabEditorLogic } from './multitabEditorLogic'
import { outputPaneLogic, OutputTab } from './outputPaneLogic'
import { InfoTab } from './OutputPaneTabs/InfoTab'
Expand Down Expand Up @@ -133,16 +128,13 @@ function RowDetailsModal({ isOpen, onClose, row, columns }: RowDetailsModalProps
export function OutputPane(): JSX.Element {
const { activeTab } = useValues(outputPaneLogic)
const { setActiveTab } = useActions(outputPaneLogic)
const { variablesForInsight } = useValues(variablesLogic)

const { editingView, sourceQuery, exportContext, isValidView, error, editorKey, metadataLoading } =
useValues(multitabEditorLogic)
const { saveAsInsight, saveAsView, setSourceQuery, runQuery } = useActions(multitabEditorLogic)
const { sourceQuery, exportContext, editorKey, metadataLoading } = useValues(multitabEditorLogic)
const { saveAsInsight, setSourceQuery } = useActions(multitabEditorLogic)
const { isDarkModeOn } = useValues(themeLogic)
const { response, responseLoading, responseError, queryId, pollResponse } = useValues(dataNodeLogic)
const { updatingDataWarehouseSavedQuery } = useValues(dataWarehouseViewsLogic)
const { updateDataWarehouseSavedQuery } = useActions(dataWarehouseViewsLogic)
const { visualizationType, queryCancelled } = useValues(dataVisualizationLogic)
const { toggleChartSettingsPanel } = useActions(dataVisualizationLogic)
const { featureFlags } = useValues(featureFlagLogic)

const vizKey = useMemo(() => `SQLEditorScene`, [])
Expand Down Expand Up @@ -225,11 +217,6 @@ export function OutputPane(): JSX.Element {

return (
<div className="flex flex-col w-full flex-1 bg-primary">
{variablesForInsight.length > 0 && (
<div className="py-2 px-4">
<VariablesForInsight />
</div>
)}
<div className="flex flex-row justify-between align-center py-2 px-4 w-full h-[55px]">
<LemonTabs
activeKey={activeTab}
Expand Down Expand Up @@ -266,9 +253,7 @@ export function OutputPane(): JSX.Element {
]}
/>
<div className="flex gap-2">
<AddVariableButton />

{exportContext && (
{activeTab === OutputTab.Results && exportContext && (
<ExportButton
disabledReason={
visualizationType != ChartDisplayType.ActionsTable &&
Expand All @@ -287,41 +272,29 @@ export function OutputPane(): JSX.Element {
]}
/>
)}

{editingView ? (
{activeTab === OutputTab.Visualization && (
<>
<LemonButton
loading={updatingDataWarehouseSavedQuery}
type="secondary"
onClick={() =>
updateDataWarehouseSavedQuery({
id: editingView.id,
query: sourceQuery.source,
types: response?.types ?? [],
})
}
>
Update view
</LemonButton>
<div className="flex justify-between flex-wrap">
<div className="flex items-center" />
<div className="flex items-center">
<div className="flex gap-2 items-center flex-wrap">
<TableDisplay />

<LemonButton
type="secondary"
icon={<IconGear />}
onClick={() => toggleChartSettingsPanel()}
tooltip="Visualization settings"
/>

<LemonButton type="primary" onClick={() => saveAsInsight()}>
Create insight
</LemonButton>
</div>
</div>
</div>
</>
) : (
<LemonButton
type="secondary"
onClick={() => saveAsView()}
disabledReason={isValidView ? '' : 'Some fields may need an alias'}
>
Save as view
</LemonButton>
)}
<LemonButton
disabledReason={error ? error : ''}
loading={responseLoading}
type="primary"
onClick={() => runQuery()}
>
<span className="mr-1">Run</span>
<KeyboardShortcut command enter />
</LemonButton>
</div>
</div>
<div className="flex flex-1 relative bg-dark">
Expand Down Expand Up @@ -364,17 +337,8 @@ export function OutputPane(): JSX.Element {
function InternalDataTableVisualization(
props: DataTableVisualizationProps & { onSaveInsight: () => void }
): JSX.Element | null {
const {
query,
visualizationType,
showEditingUI,
showResultControls,
response,
responseLoading,
isChartSettingsPanelOpen,
} = useValues(dataVisualizationLogic)

const { toggleChartSettingsPanel } = useActions(dataVisualizationLogic)
const { query, visualizationType, showEditingUI, response, responseLoading, isChartSettingsPanelOpen } =
useValues(dataVisualizationLogic)

let component: JSX.Element | null = null

Expand Down Expand Up @@ -416,29 +380,6 @@ function InternalDataTableVisualization(
)}
<div className={clsx('w-full h-full flex-1 overflow-auto')}>{component}</div>
</div>
{showResultControls && (
<>
<div className="flex justify-between flex-wrap px-px py-2">
<div className="flex items-center" />
<div className="flex items-center">
<div className="flex gap-2 items-center flex-wrap">
<TableDisplay />

<LemonButton
icon={<IconGear />}
type={isChartSettingsPanelOpen ? 'primary' : 'secondary'}
onClick={() => toggleChartSettingsPanel()}
tooltip="Visualization settings"
/>

<LemonButton type="primary" onClick={() => props.onSaveInsight()}>
Create insight
</LemonButton>
</div>
</div>
</div>
</>
)}
</div>
</div>
)
Expand Down
Loading

0 comments on commit 5b5ec0e

Please sign in to comment.