Skip to content
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

Jump to bottom

fix: resolve issue with adding global variable when input is connected #4289

Merged
merged 3 commits into from
Nov 7, 2024
Merged

fix: resolve issue with adding global variable when input is connected #4289

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fa174d
fix: prevent add global variable when inpiut is connected
anovazzi1 Oct 25, 2024
21042cf
[autofix.ci] apply automated fixes
autofix-ci[bot] Oct 25, 2024
873ed94
Merge branch 'main' into fixGlobalVariables
ogabrielluiz Nov 7, 2024
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
7 changes: 6 additions & 1 deletion src/frontend/src/components/GlobalVariableModal/GlobalVariableModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ export default function GlobalVariableModal({
initialData,
open: myOpen,
setOpen: mySetOpen,
disabled = false,
}: {
children?: JSX.Element;
asChild?: boolean;
initialData?: GlobalVariable;
open?: boolean;
setOpen?: (a: boolean | ((o?: boolean) => boolean)) => void;
disabled?: boolean;
}): JSX.Element {
const [key, setKey] = useState(initialData?.name ?? "");
const [value, setValue] = useState(initialData?.value ?? "");
Expand Down Expand Up @@ -122,6 +124,7 @@ export default function GlobalVariableModal({
setOpen={setOpen}
size="x-small"
onSubmit={submitForm}
disable={disabled}
>
<BaseModal.Header
description={
Expand All @@ -138,7 +141,9 @@ export default function GlobalVariableModal({
aria-hidden="true"
/>
</BaseModal.Header>
<BaseModal.Trigger asChild={asChild}>{children}</BaseModal.Trigger>
<BaseModal.Trigger disable={disabled} asChild={asChild}>
{children}
</BaseModal.Trigger>
<BaseModal.Content>
<div className="flex h-full w-full flex-col gap-4 align-middle">
<Label>Variable Name</Label>
Expand Down
3 changes: 3 additions & 0 deletions src/frontend/src/components/inputComponent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,11 @@ export default function InputComponent({
className={cn(
password && selectedOption === "" ? "right-8" : "right-0",
"absolute inset-y-0 flex items-center pr-2.5",
disabled && "cursor-not-allowed opacity-50",
)}
>
<button
disabled={disabled}
onClick={(e) => {
setShowOptions(!showOptions);
e.preventDefault();
Expand All @@ -168,6 +170,7 @@ export default function InputComponent({
? "text-medium-indigo"
: "text-muted-foreground",
"hover:text-accent-foreground",
disabled && "cursor-not-allowed",
)}
>
<ForwardedIconComponent
Expand Down
2 changes: 1 addition & 1 deletion ...rontend/src/components/parameterRenderComponent/components/inputGlobalComponent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default function InputGlobalComponent({
optionsPlaceholder={"Global Variables"}
optionsIcon="Globe"
optionsButton={
<GlobalVariableModal>
<GlobalVariableModal disabled={disabled}>
<CommandItem value="doNotFilter-addNewVariable">
<ForwardedIconComponent
name="Plus"
Expand Down
Loading