From 0400ee6b264b2b46c0f3ed213da4b344241c7f18 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Wed, 23 Apr 2025 20:50:40 +0530 Subject: [PATCH 1/5] Fixed the codehinter overlay triggers UI --- frontend/ee | 2 +- .../CodeEditor/CodehinterOverlayTriggers.jsx | 27 +++++++++++++++++++ .../CodeEditor/MultiLineCodeEditor.jsx | 15 +++++------ .../src/AppBuilder/CodeEditor/SearchBox.jsx | 20 -------------- .../src/AppBuilder/CodeEditor/SearchBox.scss | 4 +-- frontend/src/_styles/theme.scss | 4 +++ 6 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 frontend/src/AppBuilder/CodeEditor/CodehinterOverlayTriggers.jsx diff --git a/frontend/ee b/frontend/ee index dcd948d284..081827444f 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit dcd948d284b5f14a868480830e09b90496db8572 +Subproject commit 081827444f17634d22a2a65f258ced1b313d9b4b diff --git a/frontend/src/AppBuilder/CodeEditor/CodehinterOverlayTriggers.jsx b/frontend/src/AppBuilder/CodeEditor/CodehinterOverlayTriggers.jsx new file mode 100644 index 0000000000..c79c473169 --- /dev/null +++ b/frontend/src/AppBuilder/CodeEditor/CodehinterOverlayTriggers.jsx @@ -0,0 +1,27 @@ +/* eslint-disable import/no-unresolved */ +import React from 'react'; +import { openSearchPanel } from '@codemirror/search'; +import './SearchBox.scss'; +import { Button as ButtonComponent } from '@/components/ui/Button/Button.jsx'; + +export const CodeHinterBtns = ({ view, isPanelOpen, renderCopilot }) => { + return ( +
+ {!isPanelOpen && ( + openSearchPanel(view)} + /> + )} + {renderCopilot && renderCopilot()} +
+ ); +}; diff --git a/frontend/src/AppBuilder/CodeEditor/MultiLineCodeEditor.jsx b/frontend/src/AppBuilder/CodeEditor/MultiLineCodeEditor.jsx index ef5a5dbd7d..550336bba3 100644 --- a/frontend/src/AppBuilder/CodeEditor/MultiLineCodeEditor.jsx +++ b/frontend/src/AppBuilder/CodeEditor/MultiLineCodeEditor.jsx @@ -21,8 +21,9 @@ import { removeNestedDoubleCurlyBraces } from '@/_helpers/utils'; import useStore from '@/AppBuilder/_stores/store'; import { shallow } from 'zustand/shallow'; import { search, searchKeymap, searchPanelOpen } from '@codemirror/search'; -import { handleSearchPanel, SearchBtn } from './SearchBox'; +import { handleSearchPanel } from './SearchBox'; import { isInsideParent } from './utils'; +import { CodeHinterBtns } from './CodehinterOverlayTriggers'; const langSupport = Object.freeze({ javascript: javascript(), @@ -73,6 +74,8 @@ const MultiLineCodeEditor = (props) => { const [editorView, setEditorView] = React.useState(null); + const [isSearchPanelOpen, setIsSearchPanelOpen] = React.useState(false); + const handleOnBlur = () => { if (!delayOnChange) return onChange(currentValueRef.current); setTimeout(() => { @@ -248,7 +251,7 @@ const MultiLineCodeEditor = (props) => { ref={wrapperRef} >
- + { isMultiEditor={true} isQueryManager={isInsideQueryPane} /> - {renderCopilot && renderCopilot()} { readOnly={readOnly} editable={editable} //for transformations in query manager onCreateEditor={(view) => setEditorView(view)} - onUpdate={(view) => { - const icon = document.querySelector('.codehinter-search-btn'); - if (searchPanelOpen(view.state)) { - icon.style.display = 'none'; - } else icon.style.display = 'block'; - }} + onUpdate={(view) => setIsSearchPanelOpen(searchPanelOpen(view.state))} />
{showPreview && ( diff --git a/frontend/src/AppBuilder/CodeEditor/SearchBox.jsx b/frontend/src/AppBuilder/CodeEditor/SearchBox.jsx index 28f7451b95..140ff2a7db 100644 --- a/frontend/src/AppBuilder/CodeEditor/SearchBox.jsx +++ b/frontend/src/AppBuilder/CodeEditor/SearchBox.jsx @@ -9,7 +9,6 @@ import { findPrevious, replaceNext, replaceAll, - openSearchPanel, } from '@codemirror/search'; import './SearchBox.scss'; import InputComponent from '@/components/ui/Input/Index.jsx'; @@ -162,22 +161,3 @@ function SearchPanel({ view }) { ); } - -export const SearchBtn = ({ view }) => { - return ( -
- openSearchPanel(view)} - /> -
- ); -}; diff --git a/frontend/src/AppBuilder/CodeEditor/SearchBox.scss b/frontend/src/AppBuilder/CodeEditor/SearchBox.scss index 24c948b0ee..79de28f28a 100644 --- a/frontend/src/AppBuilder/CodeEditor/SearchBox.scss +++ b/frontend/src/AppBuilder/CodeEditor/SearchBox.scss @@ -44,7 +44,5 @@ } .code-hinter-wrapper .codehinter-search-btn { - display: block; - padding-top: 1px; - z-index: 10000; + z-index: 1000; } \ No newline at end of file diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss index 4fd1083987..297cc5c9fd 100644 --- a/frontend/src/_styles/theme.scss +++ b/frontend/src/_styles/theme.scss @@ -18393,6 +18393,10 @@ section.ai-message-prompt-input-wrapper { } } +.codehinter-copilot-btn { + z-index: 1000; +} + #copilot-menu { width: 440px; max-width: 440px; From 124a083ae3a1af23ee07f865baedfe4e24a8e76e Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Thu, 24 Apr 2025 11:07:08 +0530 Subject: [PATCH 2/5] Fixed input icons not visible --- frontend/src/components/ui/Input/Input.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/ui/Input/Input.jsx b/frontend/src/components/ui/Input/Input.jsx index 33c3194f0b..610232eadf 100644 --- a/frontend/src/components/ui/Input/Input.jsx +++ b/frontend/src/components/ui/Input/Input.jsx @@ -19,7 +19,7 @@ const Input = React.forwardRef(({ className, size, type, ...props }, ref) => { type={isPasswordField && isPasswordVisible ? 'text' : type} className={cn( inputVariants({ size }), - `tw-relative tw-peer tw-flex tw-text-[12px]/[18px] tw-w-full tw-rounded-[8px] tw-border-[1px] tw-border-solid tw-bg-background-surface-layer-01 tw-py-[7px] tw-text-text-default focus-visible:tw-ring-[1px] focus-visible:tw-ring-offset-[1px] focus-visible:tw-ring-border-accent-strong focus-visible:tw-ring-offset-border-accent-strong focus-visible:tw-border-transparent disabled:tw-cursor-not-allowed ${props.styles}`, + `tw-peer tw-flex tw-text-[12px]/[18px] tw-w-full tw-rounded-[8px] tw-border-[1px] tw-border-solid tw-bg-background-surface-layer-01 tw-py-[7px] tw-text-text-default focus-visible:tw-ring-[1px] focus-visible:tw-ring-offset-[1px] focus-visible:tw-ring-border-accent-strong focus-visible:tw-ring-offset-border-accent-strong focus-visible:tw-border-transparent disabled:tw-cursor-not-allowed ${props.styles}`, className )} ref={ref} From e3772f359bacd8dd2d41eac2b19d863078542cef Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Fri, 16 May 2025 14:31:28 +0530 Subject: [PATCH 3/5] Update submodule references --- frontend/ee | 2 +- server/ee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/ee b/frontend/ee index 19ffec9fa1..3ea0094833 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 19ffec9fa114d4e99adb59c37a22483b8ccb9a46 +Subproject commit 3ea00948337568e0c9780215ce1506264c3aa145 diff --git a/server/ee b/server/ee index b9e73f87b9..e18cbbf437 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit b9e73f87b9062e06c49c2c73add6b82ba21dcacf +Subproject commit e18cbbf43725a99fbaf85fe1571e7c42366b39eb From b53b8100d3c39741573763440803caf934da84f5 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Fri, 16 May 2025 14:35:39 +0530 Subject: [PATCH 4/5] Revert "Update submodule references" This reverts commit e3772f359bacd8dd2d41eac2b19d863078542cef. --- frontend/ee | 2 +- server/ee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/ee b/frontend/ee index 3ea0094833..19ffec9fa1 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 3ea00948337568e0c9780215ce1506264c3aa145 +Subproject commit 19ffec9fa114d4e99adb59c37a22483b8ccb9a46 diff --git a/server/ee b/server/ee index e18cbbf437..b9e73f87b9 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit e18cbbf43725a99fbaf85fe1571e7c42366b39eb +Subproject commit b9e73f87b9062e06c49c2c73add6b82ba21dcacf From c5fe9f67d0659d4de3dde3cd976d482057c8581b Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Fri, 16 May 2025 14:35:55 +0530 Subject: [PATCH 5/5] Update frontend submodule --- frontend/ee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/ee b/frontend/ee index 19ffec9fa1..3ea0094833 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 19ffec9fa114d4e99adb59c37a22483b8ccb9a46 +Subproject commit 3ea00948337568e0c9780215ce1506264c3aa145