Skip to content

Fe/bugfix ri 3726 remove workbench changes (that were part of EXPLAIN/PROFILE command) for now #1655

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.

Sign up for GitHub

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 4 commits into from
Jan 31, 2023
Merged

Fe/bugfix ri 3726 remove workbench changes (that were part of EXPLAIN/PROFILE command) for now #1655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47913b1
Revert "- Add null checks for generate profile command functions"
GnaneshKunal Jan 31, 2023
efaa720
Revert "- Move queryProfile to parent and create a new telement event…
GnaneshKunal Jan 31, 2023
58a0ccc
Revert "Fix comments - https://github.com/RedisInsight/RedisInsight/p…
GnaneshKunal Jan 31, 2023
dee1683
Revert "Add ability to run a profile/explain right from the query car…
GnaneshKunal Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions redisinsight/ui/src/assets/img/workbench/vis_tag_cloud.svg
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions redisinsight/ui/src/components/query-card/QueryCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import cx from 'classnames'
import { EuiLoadingContent, keys } from '@elastic/eui'
import { useParams } from 'react-router-dom'

import { WBQueryType, ProfileQueryType } from 'uiSrc/pages/workbench/constants'
import { WBQueryType } from 'uiSrc/pages/workbench/constants'
import { RunQueryMode, ResultsMode, ResultsSummary } from 'uiSrc/slices/interfaces/workbench'
import {
getWBQueryType,
Expand Down Expand Up @@ -44,7 +44,6 @@ export interface Props {
onQueryDelete: () => void
onQueryReRun: () => void
onQueryOpen: () => void
onQueryProfile: (type: ProfileQueryType) => void
}

const getDefaultPlugin = (views: IPluginVisualization[], query: string) =>
Expand Down Expand Up @@ -76,7 +75,6 @@ const QueryCard = (props: Props) => {
createdAt,
onQueryOpen,
onQueryDelete,
onQueryProfile,
onQueryReRun,
loading,
emptyCommand,
Expand Down Expand Up @@ -188,7 +186,6 @@ const QueryCard = (props: Props) => {
setSelectedValue={changeViewTypeSelected}
onQueryDelete={onQueryDelete}
onQueryReRun={onQueryReRun}
onQueryProfile={onQueryProfile}
/>
{isOpen && (
<>
Expand Down
47 changes: 1 addition & 46 deletions redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { numberWithSpaces } from 'uiSrc/utils/numbers'
import { ThemeContext } from 'uiSrc/contexts/themeContext'
import { appPluginsSelector } from 'uiSrc/slices/app/plugins'
import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
import { getViewTypeOptions, WBQueryType, getProfileViewTypeOptions, ProfileQueryType, isCommandAllowedForProfile } from 'uiSrc/pages/workbench/constants'
import { getViewTypeOptions, WBQueryType } from 'uiSrc/pages/workbench/constants'
import { IPluginVisualization } from 'uiSrc/slices/interfaces'
import { RunQueryMode, ResultsMode, ResultsSummary } from 'uiSrc/slices/interfaces/workbench'
import { appRedisCommandsSelector } from 'uiSrc/slices/app/redis-commands'
Expand Down Expand Up @@ -70,7 +70,6 @@ export interface Props {
setSelectedValue: (type: WBQueryType, value: string) => void
onQueryDelete: () => void
onQueryReRun: () => void
onQueryProfile: (type: ProfileQueryType) => void
}

const getExecutionTimeString = (value: number): string => {
Expand Down Expand Up @@ -239,30 +238,6 @@ const QueryCardHeader = (props: Props) => {
}
})

const profileOptions: EuiSuperSelectOption<any>[] = (getProfileViewTypeOptions() as any[]).map((item) => {
const { value, id, text } = item
return {
value: id ?? value,
inputDisplay: (
<div className={cx(styles.dropdownOption, styles.dropdownProfileOption)}>
<EuiIcon
className={styles.iconDropdownOption}
type="visTagCloud"
data-testid={`view-type-selected-${value}-${id}`}
/>
</div>
),
dropdownDisplay: (
<div className={cx(styles.dropdownOption, styles.dropdownProfileOption)}>
<span>{truncateText(text, 20)}</span>
</div>
),
'data-test-subj': `profile-type-option-${value}-${id}`,
}
})

const canCommandProfile = isCommandAllowedForProfile(query)

const indexForSeparator = findIndex(pluginsOptions, (option) => !option.internal)
if (indexForSeparator > -1) {
modifiedOptions.splice(indexForSeparator + 1, 0, {
Expand Down Expand Up @@ -346,26 +321,6 @@ const QueryCardHeader = (props: Props) => {
</EuiToolTip>
)}
</EuiFlexItem>
<EuiFlexItem
grow={false}
className={cx(styles.buttonIcon, styles.viewTypeIcon)}
onClick={onDropDownViewClick}
>
{isOpen && canCommandProfile && !summaryText && (
<div className={styles.dropdownWrapper}>
<div className={styles.dropdown}>
<EuiSuperSelect
options={profileOptions}
itemClassName={cx(styles.changeViewItem, styles.dropdownProfileItem)}
className={cx(styles.changeView, styles.dropdownProfileIcon)}
valueOfSelected={ProfileQueryType.Profile}
onChange={(value: ProfileQueryType) => onQueryProfile(value)}
data-testid="run-profile-type"
/>
</div>
</div>
)}
</EuiFlexItem>
<EuiFlexItem
grow={false}
className={cx(styles.buttonIcon, styles.viewTypeIcon)}
Expand Down
21 changes: 0 additions & 21 deletions redisinsight/ui/src/components/query-card/QueryCardHeader/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,27 +127,6 @@ $marginIcon: 12px;
height: 40px;
}

.dropdownProfileIcon {
padding: inherit !important;
:global {
.euiSuperSelectControl.euiFormControlLayoutIcons {
display: none !important;
}
}
}

.dropdownProfileOption {
display: inherit !important;
}

.dropdownProfileItem {
:global {
.euiContextMenu__icon {
display: none !important;
}
}
}

.dropdown {
width: 168px;
position: absolute;
Expand Down
14 changes: 0 additions & 14 deletions redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import cx from 'classnames'
import { EuiIcon, EuiText } from '@elastic/eui'

import { Theme } from 'uiSrc/constants'
import { ProfileQueryType } from 'uiSrc/pages/workbench/constants'
import { generateProfileQueryForCommand } from 'uiSrc/pages/workbench/utils'
import { CodeButtonParams } from 'uiSrc/pages/workbench/components/enablement-area/interfaces'
import { Nullable } from 'uiSrc/utils'
import QueryCard from 'uiSrc/components/query-card'
Expand All @@ -23,15 +21,13 @@ export interface Props {
onQueryReRun: (query: string, commandId?: Nullable<string>, executeParams?: CodeButtonParams) => void
onQueryDelete: (commandId: string) => void
onQueryOpen: (commandId: string) => void
onQueryProfile: (query: string, commandId?: Nullable<string>, executeParams?: CodeButtonParams) => void
}
const WBResults = (props: Props) => {
const {
items = [],
activeMode,
activeResultsMode,
onQueryReRun,
onQueryProfile,
onQueryDelete,
onQueryOpen,
scrollDivRef
Expand Down Expand Up @@ -90,16 +86,6 @@ const WBResults = (props: Props) => {
resultsMode={resultsMode}
db={db}
onQueryOpen={() => onQueryOpen(id)}
onQueryProfile={(profileType: ProfileQueryType) => {
const profileQuery = generateProfileQueryForCommand(command, profileType)
if (profileQuery) {
return onQueryProfile(
profileQuery,
null,
{ mode, results: resultsMode, clearEditor: false, },
)
}
}}
onQueryReRun={() => onQueryReRun(
command,
null,
Expand Down
1 change: 0 additions & 1 deletion redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export interface Props {
onQueryReRun: (query: string, commandId?: Nullable<string>, executeParams?: CodeButtonParams) => void
onQueryOpen: (commandId: string) => void
onQueryDelete: (commandId: string) => void
onQueryProfile: (query: string, commandId?: Nullable<string>, executeParams?: CodeButtonParams) => void
}

const WBResultsWrapper = (props: Props) => (
Expand Down
6 changes: 0 additions & 6 deletions redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,6 @@ const WBView = (props: Props) => {
onSubmit(query, commandId, executeParams)
}

const handleProfile = (query?: string, commandId?: Nullable<string>, executeParams: CodeButtonParams = {}) => {
sendEventSubmitTelemetry(TelemetryEvent.WORKBENCH_COMMAND_PROFILE, query, executeParams)
onSubmit(query, commandId, executeParams)
}

const sendEventSubmitTelemetry = (
event: TelemetryEvent,
commandInit = script,
Expand Down Expand Up @@ -241,7 +236,6 @@ const WBView = (props: Props) => {
activeResultsMode={resultsMode}
scrollDivRef={scrollDivRef}
onQueryReRun={handleReRun}
onQueryProfile={handleProfile}
onQueryOpen={onQueryOpen}
onQueryDelete={onQueryDelete}
/>
Expand Down
34 changes: 0 additions & 34 deletions redisinsight/ui/src/pages/workbench/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,40 +27,6 @@ export const VIEW_TYPE_OPTIONS = [
export const getViewTypeOptions = () =>
[...VIEW_TYPE_OPTIONS]


export const SEARCH_COMMANDS = ['ft.search', 'ft.aggregate']
export const GRAPH_COMMANDS = ['graph.query']

const ALLOWED_PROFILE_COMMANDS = [...SEARCH_COMMANDS, ...GRAPH_COMMANDS]

export const isCommandAllowedForProfile = (query: string) => {
return ALLOWED_PROFILE_COMMANDS.includes(query?.split(' ')?.[0]?.toLowerCase())
}

export enum ProfileQueryType {
Profile = 'Profile',
Explain = 'Explain'
}

const PROFILE_VIEW_TYPE_OPTIONS = [
{
id: ProfileQueryType.Profile,
text: 'Profile the command',
name: 'Profile',
value: WBQueryType.Text,
},
{
id: ProfileQueryType.Explain,
text: 'Explain the command',
name: 'Explain',
value: WBQueryType.Text,
},
]

export const getProfileViewTypeOptions = () =>
[...PROFILE_VIEW_TYPE_OPTIONS]


export enum ModuleCommandPrefix {
RediSearch = 'FT.',
}
Expand Down
79 changes: 0 additions & 79 deletions redisinsight/ui/src/pages/workbench/utils.spec.ts
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions redisinsight/ui/src/pages/workbench/utils.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion redisinsight/ui/src/telemetry/events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ export enum TelemetryEvent {

WORKBENCH_COMMAND_COPIED = 'WORKBENCH_COMMAND_COPIED',
WORKBENCH_COMMAND_RUN_AGAIN = 'WORKBENCH_COMMAND_RUN_AGAIN',
WORKBENCH_COMMAND_PROFILE = 'WORKBENCH_COMMAND_PROFILE',
WORKBENCH_COMMAND_DELETE_COMMAND = 'WORKBENCH_COMMAND_DELETE_COMMAND',
WORKBENCH_RESULTS_IN_FULL_SCREEN = 'WORKBENCH_RESULTS_IN_FULL_SCREEN',
WORKBENCH_RESULTS_COLLAPSED = 'WORKBENCH_RESULTS_COLLAPSED',
Expand Down