Skip to content

Fix dropdowns in accordion and error text colors #50845

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
bbovenzi merged 2 commits into from
May 20, 2025
Merged

Fix dropdowns in accordion and error text colors #50845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da4aa7a
Fix dropdowns in accordion and error text colors
bbovenzi May 19, 2025
f1020e0
Fix dropdown overflow and var names
bbovenzi May 20, 2025
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
36 changes: 24 additions & 12 deletions airflow-core/src/airflow/ui/src/components/FlexibleForm/FlexibleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Box, Icon, Stack, StackSeparator, Text } from "@chakra-ui/react";
import { Icon, Stack, StackSeparator, Text } from "@chakra-ui/react";
import { useCallback, useEffect, useState } from "react";
import { MdError } from "react-icons/md";

Expand All @@ -39,7 +39,7 @@ export const FlexibleForm = ({
initialParamsDict,
setError,
}: FlexibleFormProps) => {
const { paramsDict: params, setinitialParamDict, setParamsDict } = useParamStore();
const { paramsDict: params, setInitialParamDict, setParamsDict } = useParamStore();
const processedSections = new Map();
const [sectionError, setSectionError] = useState<Map<string, boolean>>(new Map());

Expand All @@ -62,17 +62,17 @@ export const FlexibleForm = ({
const paramsCopy = structuredClone(initialParamsDict.paramsDict);

setParamsDict(paramsCopy);
setinitialParamDict(initialParamsDict.paramsDict);
setInitialParamDict(initialParamsDict.paramsDict);
}
}, [initialParamsDict, params, setParamsDict, setinitialParamDict]);
}, [initialParamsDict, params, setParamsDict, setInitialParamDict]);

useEffect(
() => () => {
// Clear paramsDict and initialParamDict when the component is unmounted or modal closes
setParamsDict({});
setinitialParamDict({});
setInitialParamDict({});
},
[setParamsDict, setinitialParamDict],
[setParamsDict, setInitialParamDict],
);

useEffect(() => {
Expand Down Expand Up @@ -103,17 +103,29 @@ export const FlexibleForm = ({
processedSections.set(currentSection, true);

return (
<Accordion.Item key={currentSection} value={currentSection}>
<Accordion.Item
// We need to make the item content overflow visible for dropdowns to work, but directly applying the style does not work
css={{
"& > :nth-child(2)": {
overflow: "visible",
},
}}
key={currentSection}
value={currentSection}
>
<Accordion.ItemTrigger cursor="button">
<Text color={sectionError.get(currentSection) ? "red" : undefined}>{currentSection}</Text>
<Text color={sectionError.get(currentSection) ? "fg.error" : undefined}>
{currentSection}
</Text>
{sectionError.get(currentSection) ? (
<Icon color="red" margin="-1">
<Icon color="fg.error" margin="-1">
<MdError />
</Icon>
) : undefined}
</Accordion.ItemTrigger>
<Accordion.ItemContent paddingTop={0}>
<Box p={5}>

<Accordion.ItemContent pt={0}>
<Accordion.ItemBody>
<Stack separator={<StackSeparator />}>
{Object.entries(params)
.filter(
Expand All @@ -125,7 +137,7 @@ export const FlexibleForm = ({
<Row key={name} name={name} onUpdate={onUpdate} />
))}
</Stack>
</Box>
</Accordion.ItemBody>
</Accordion.ItemContent>
</Accordion.Item>
);
Expand Down
4 changes: 2 additions & 2 deletions airflow-core/src/airflow/ui/src/queries/useParamStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type FormStore = {
initialParamDict: ParamsSpec;
paramsDict: ParamsSpec;
setConf: (confString: string) => void;
setinitialParamDict: (newParamsDict: ParamsSpec) => void;
setInitialParamDict: (newParamsDict: ParamsSpec) => void;
setParamsDict: (newParamsDict: ParamsSpec) => void;
};

Expand Down Expand Up @@ -83,7 +83,7 @@ export const useParamStore = create<FormStore>((set) => ({
return { conf: confString, paramsDict: updatedParamsDict };
}),

setinitialParamDict: (newParamsDict: ParamsSpec) => set(() => ({ initialParamDict: newParamsDict })),
setInitialParamDict: (newParamsDict: ParamsSpec) => set(() => ({ initialParamDict: newParamsDict })),

setParamsDict: (newParamsDict: ParamsSpec) =>
set((state) => {
Expand Down