Skip to content

Commit f0b2383

Browse files
authored
Merge pull request #4818 from continuedev/pe/assistant-polish2
feat: assistant polish pt 2
2 parents 40a9a76 + c7b3ea8 commit f0b2383

File tree

9 files changed

+30
-21
lines changed

9 files changed

+30
-21
lines changed

gui/src/components/gui/Tooltip.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export function ToolTip(props: any) {
2525
return (
2626
tooltipPortalDiv &&
2727
ReactDOM.createPortal(
28-
<Tooltip {...props} style={combinedStyles} opacity={1} delayShow={400} />,
28+
<Tooltip {...props} style={combinedStyles} opacity={1} delayShow={200} />,
2929
tooltipPortalDiv,
3030
)
3131
);

gui/src/components/mainInput/InputToolbar/bottom/ToolDropdownItem.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function ToolDropdownItem(props: ToolDropdownItemProps) {
3131

3232
return (
3333
<div
34-
className="flex items-center justify-between gap-2 px-2 py-0.5"
34+
className="hover:bg-list-active hover:text-list-active-foreground -mx-2 flex cursor-pointer items-center justify-between gap-2 rounded-md px-2 py-0.5"
3535
style={{
3636
fontSize: fontSize(-3),
3737
}}
@@ -74,7 +74,7 @@ function ToolDropdownItem(props: ToolDropdownItemProps) {
7474
className="h-4 w-4"
7575
/>
7676
)}
77-
{props.tool.function.name}{" "}
77+
<pre className="my-0.5 text-[11px]">{props.tool.function.name}</pre>
7878
</span>
7979
</div>
8080
{props.excluded ? (

gui/src/components/mainInput/InputToolbar/bottom/ToolPermissionsDialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const ToolPermissionsDialog = () => {
4343
<>
4444
{toolsByGroup.map(([groupName, tools]) => (
4545
<div key={groupName} className="mt-2 flex flex-col pr-1">
46-
<div className="flex flex-row items-center justify-between px-1 pr-3">
46+
<div className="flex flex-row items-center justify-between px-1">
4747
<h3
4848
className="m-0 p-0 font-bold"
4949
style={{

gui/src/components/mainInput/Lump/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export function Lump(props: LumpProps) {
6969
/>
7070

7171
<ContentDiv
72-
className="thin-scrollbar pr-0.5"
72+
className="no-scrollbar pr-0.5"
7373
hasSection={!!selectedSection}
7474
isVisible={isVisible}
7575
>

gui/src/components/mainInput/Lump/sections/RulesSection.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const RuleCard: React.FC<RuleCardProps> = ({ index, rule, onClick, title }) => {
6565
{rule}
6666
</div>
6767
</div>
68-
<div className="flex items-center gap-2">
68+
<div className="flex items-center gap-1">
6969
<HeaderButtonWithToolTip onClick={onClickExpand} text="Expand">
7070
<ArrowsPointingOutIcon className="h-3 w-3 text-gray-400" />
7171
</HeaderButtonWithToolTip>{" "}

gui/src/components/mainInput/Lump/sections/docs/DocsIndexingStatus.tsx

+7-8
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@ function DocsIndexingStatus({
9090
}
9191
}}
9292
>
93-
<StatusIndicator
94-
status={status?.status}
95-
hoverMessage={
96-
status?.status === "failed" ? status?.debugInfo : undefined
97-
}
98-
/>
9993
{docConfig.faviconUrl ? (
10094
<img
10195
src={docConfig.faviconUrl}
@@ -114,7 +108,7 @@ function DocsIndexingStatus({
114108
</div>
115109

116110
<div className="flex flex-row items-center gap-2">
117-
<div className="flex flex-row items-center gap-1 text-gray-400">
111+
<div className="flex flex-row items-center gap-2 text-gray-400">
118112
{status?.status === "indexing" && (
119113
<span
120114
className="text-xs"
@@ -144,7 +138,12 @@ function DocsIndexingStatus({
144138
/>
145139
)}
146140

147-
{/* Removed StatusIndicator from here */}
141+
<StatusIndicator
142+
status={status?.status}
143+
hoverMessage={
144+
status?.status === "failed" ? status?.debugInfo : undefined
145+
}
146+
/>
148147
</div>
149148
</div>
150149
</div>

gui/src/components/mainInput/Lump/sections/docs/DocsSection.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function DocsIndexingStatuses() {
5353

5454
return (
5555
<div className="flex flex-col gap-1">
56-
<div className="flex flex-col gap-1 overflow-y-auto overflow-x-hidden pr-2">
56+
<div className="flex flex-col overflow-y-auto overflow-x-hidden pr-2">
5757
{sortedConfigDocs.map((docConfig) => {
5858
return (
5959
<div

gui/src/pages/config/AccountButton.tsx

+15-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { UserCircleIcon } from "@heroicons/react/24/outline";
1+
import { UserCircleIcon } from "@heroicons/react/24/solid";
22

33
import { SecondaryButton } from "../../components";
44
import {
@@ -8,10 +8,13 @@ import {
88
Transition,
99
} from "../../components/ui";
1010
import { useAuth } from "../../context/Auth";
11+
import { selectSelectedOrganization } from "../../redux";
12+
import { useAppSelector } from "../../redux/hooks";
1113
import { ScopeSelect } from "./ScopeSelect";
1214

1315
export function AccountButton() {
1416
const { session, logout, login, organizations } = useAuth();
17+
const selectedOrg = useAppSelector(selectSelectedOrganization);
1518

1619
if (!session) {
1720
return (
@@ -26,8 +29,13 @@ export function AccountButton() {
2629

2730
return (
2831
<Popover className="relative">
29-
<PopoverButton className="bg-vsc-background hover:bg-vsc-input-background text-vsc-foreground flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-none">
30-
<UserCircleIcon className="h-6 w-6" />
32+
<PopoverButton className="bg-vsc-background hover:bg-vsc-input-background text-vsc-foreground my-0.5 flex cursor-pointer rounded-md border-none px-2">
33+
<div className="flex items-center gap-1.5">
34+
<span className="font-medium">
35+
{selectedOrg === null ? "Personal" : selectedOrg.name}
36+
</span>
37+
<UserCircleIcon className="h-6 w-6" />{" "}
38+
</div>
3139
</PopoverButton>
3240

3341
<Transition>
@@ -39,15 +47,17 @@ export function AccountButton() {
3947
{session.account.id}
4048
</span>
4149
</div>
50+
4251
{organizations.length > 0 && (
4352
<div className="flex flex-col gap-1">
44-
<label className="text-vsc-foreground text-sm">
53+
<label className="text-vsc-foreground text-xs">
4554
Organization
4655
</label>
4756
<ScopeSelect />
4857
</div>
4958
)}
50-
<SecondaryButton onClick={logout} className="">
59+
60+
<SecondaryButton onClick={logout} className="!mx-0 w-full">
5161
Sign out
5262
</SecondaryButton>
5363
</div>

gui/src/pages/config/ScopeSelect.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {
22
BuildingOfficeIcon,
33
ChevronUpDownIcon,
4-
UserCircleIcon,
54
} from "@heroicons/react/24/outline";
5+
import { UserCircleIcon } from "@heroicons/react/24/solid";
66
import {
77
Listbox,
88
ListboxButton,

0 commit comments

Comments
 (0)