## Description ### Fixes - [x] https://github.com/appsmithorg/appsmith/issues/19383 - [x] https://github.com/appsmithorg/appsmith/issues/19384 - [x] https://github.com/appsmithorg/appsmith/issues/19385 - [x] https://github.com/appsmithorg/appsmith/issues/19386 - [x] https://github.com/appsmithorg/appsmith/issues/19387 - [x] https://github.com/appsmithorg/appsmith/issues/19388 - [x] https://github.com/appsmithorg/appsmith/issues/19389 - [x] https://github.com/appsmithorg/appsmith/issues/19390 - [x] https://github.com/appsmithorg/appsmith/issues/19391 - [x] https://github.com/appsmithorg/appsmith/issues/19392 - [x] https://github.com/appsmithorg/appsmith/issues/19393 - [x] https://github.com/appsmithorg/appsmith/issues/19394 - [x] https://github.com/appsmithorg/appsmith/issues/19395 - [x] https://github.com/appsmithorg/appsmith/issues/19396 - [x] https://github.com/appsmithorg/appsmith/issues/19397 - [x] https://github.com/appsmithorg/appsmith/issues/19398 - [x] https://github.com/appsmithorg/appsmith/issues/19399 - [x] https://github.com/appsmithorg/appsmith/issues/19400 - [x] https://github.com/appsmithorg/appsmith/issues/19401 - [x] https://github.com/appsmithorg/appsmith/issues/19402 - [x] https://github.com/appsmithorg/appsmith/issues/19403 - [x] https://github.com/appsmithorg/appsmith/issues/19404 - [x] https://github.com/appsmithorg/appsmith/issues/19405 - [x] https://github.com/appsmithorg/appsmith/issues/19406 - [x] https://github.com/appsmithorg/appsmith/issues/19407 - [x] https://github.com/appsmithorg/appsmith/issues/19408 - [x] https://github.com/appsmithorg/appsmith/issues/19409 Fixes # (issue) > if no issue exists, please create an issue and ask the maintainers about this first Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video ## Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update ## How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce. > Please also list any relevant details for your test configuration. > Delete anything that is not important - Manual - Jest - Cypress ### Test Plan > Add Testsmith test cases links that relate to this PR ### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) ## Checklist: ### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag ### QA activity: - [ ] Test plan has been approved by relevant developers - [ ] Test plan has been peer reviewed by QA - [ ] Cypress test cases have been added and approved by either SDET or manual QA - [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA - [ ] Added Test Plan Approved label after reveiwing all Cypress test --------- Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvi@appsmith.com> Co-authored-by: Arsalan <arsalanyaldram0211@outlook.com> Co-authored-by: Aman Agarwal <aman@appsmith.com> Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Vijetha-Kaja <vijetha@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Apple <nandan@thinkify.io> Co-authored-by: Saroj <43822041+sarojsarab@users.noreply.github.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Co-authored-by: rahulramesha <rahul@appsmith.com> Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: Preet Sidhu <preetsidhu.bits@gmail.com> Co-authored-by: Vijetha-Kaja <119562824+Vijetha-Kaja@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
123 lines
3.1 KiB
TypeScript
123 lines
3.1 KiB
TypeScript
import React, { useEffect } from "react";
|
|
import FormControl from "pages/Editor/FormControl";
|
|
import { Classes, Text, TextType } from "design-system-old";
|
|
import styled from "styled-components";
|
|
import { FieldArray } from "redux-form";
|
|
import type { ControlProps } from "./BaseControl";
|
|
import { Button } from "design-system";
|
|
|
|
const CenteredIcon = styled(Button)`
|
|
margin-top: 26px;
|
|
&.hide {
|
|
opacity: 0;
|
|
pointer-events: none;
|
|
}
|
|
`;
|
|
|
|
const PrimaryBox = styled.div`
|
|
display: flex;
|
|
width: min-content;
|
|
flex-direction: column;
|
|
border: 2px solid ${(props) => props.theme.colors.apiPane.dividerBg};
|
|
padding: 10px;
|
|
`;
|
|
|
|
const SecondaryBox = styled.div`
|
|
display: flex;
|
|
flex-direction: row;
|
|
width: min-content;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
padding: 5px;
|
|
|
|
& > div {
|
|
margin-right: 8px;
|
|
height: 60px;
|
|
}
|
|
|
|
& > .t--form-control-QUERY_DYNAMIC_INPUT_TEXT > div {
|
|
width: 20vw !important;
|
|
}
|
|
|
|
& > .t--form-control-DROP_DOWN,
|
|
& > .t--form-control-DROP_DOWN > div > div,
|
|
& > .t--form-control-DROP_DOWN > div > div > div > div {
|
|
width: 12vw;
|
|
}
|
|
`;
|
|
|
|
const AddMoreAction = styled.div`
|
|
width: fit-content;
|
|
cursor: pointer;
|
|
display: flex;
|
|
margin-top: 16px;
|
|
.${Classes.TEXT} {
|
|
margin-left: 8px;
|
|
color: #03b365;
|
|
}
|
|
`;
|
|
function NestedComponents(props: any) {
|
|
useEffect(() => {
|
|
if (props.fields.length < 1) {
|
|
props.fields.push({ path: "", value: "" });
|
|
}
|
|
}, [props.fields.length]);
|
|
return (
|
|
<PrimaryBox>
|
|
{props.fields &&
|
|
props.fields.length > 0 &&
|
|
props.fields.map((field: string, index: number) => {
|
|
return (
|
|
<SecondaryBox key={index}>
|
|
{props.schema.map((sch: any, idx: number) => {
|
|
sch = {
|
|
...sch,
|
|
configProperty: `${field}.${sch.key}`,
|
|
customStyles: {
|
|
width: "20vw",
|
|
...props.customStyles,
|
|
},
|
|
};
|
|
return (
|
|
<FormControl
|
|
config={sch}
|
|
formName={props.formName}
|
|
key={idx}
|
|
/>
|
|
);
|
|
})}
|
|
<CenteredIcon
|
|
isIconButton
|
|
kind="tertiary"
|
|
onClick={(e: React.MouseEvent) => {
|
|
e.stopPropagation();
|
|
props.fields.remove(index);
|
|
}}
|
|
size="sm"
|
|
startIcon="delete"
|
|
/>
|
|
</SecondaryBox>
|
|
);
|
|
})}
|
|
<AddMoreAction onClick={() => props.fields.push({ path: "", value: "" })}>
|
|
{/*Hardcoded label to be removed */}
|
|
<Text type={TextType.H5}>+ Add Condition (And)</Text>
|
|
</AddMoreAction>
|
|
</PrimaryBox>
|
|
);
|
|
}
|
|
|
|
export default function FieldArrayControl(props: FieldArrayControlProps) {
|
|
const { configProperty, formName, schema } = props;
|
|
return (
|
|
<FieldArray
|
|
component={NestedComponents}
|
|
name={configProperty}
|
|
props={{ formName, schema }}
|
|
rerenderOnEveryChange={false}
|
|
/>
|
|
);
|
|
}
|
|
|
|
export type FieldArrayControlProps = ControlProps;
|