2021-06-07 05:13:16 +00:00
|
|
|
import React, { useEffect } from "react";
|
|
|
|
|
import FormControl from "pages/Editor/FormControl";
|
chore: import common variables from design system (#17600)
* Delete CommonComponentProps, Classes, import them from design-system
* Delete Icon.test.tsx
* Remove color utils, add import from design-system
* Remove Variant, add import from design-system
* Remove unused toast parameters from common
* use design-system version 28-alpha-7
* Move ThemeProp from ads/common to widgets/constants
* fix import
* Delete index.ts
* feat: migrated form group from ads folder to design system repository (#17400)
* feat: migrated form group from ads folder to design system repo
* fix: formGroup label color fix
* DS version updated
* Updated Label Config
* chore: Flapdoodle version upgrade to 3.5.0 (#17609)
* chore: code split tenant API CE (#17596)
## Description
We shouldn't expose tenant config on CE , so on CE, we should only return the necessary user permissions hard coded on the saga.
## Type of change
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Manual
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
* chore: BaseAppsmithRepo code split (#17614)
* chore: Updating the tenant API to return the complete object instead of just the configuration (#17615)
* Fix sandbox iframe default setting (#17618)
* feat: upgrade hooks | audit logs (#17525)
* feat: Text Widget Reskinning (#17298)
* feat: Use truncate button color from theme
* fix: Update Truncate Button Color validation regex
* feat: Maintain Focus and Context Phase 1 (#16317)
* fix: update regex and test case for organisation website (#17612)
* chore: Add properties to analytics event (#17621)
* feat: enabled setTimeout/clearTimeout APIs (#17445)
* Update top contributors
* fix: ms sql default port updated to 1433 (#17342)
* fix: removed global style from design system dropdown component (#17392)
* bug: removed global style from design system dropdown component
* changed design system package version
* fix: Dropdown background fix - design system
* design-system - dropdown background color fix
* DS version updated
* chore: Fixing broken client build (#17634)
## Description
EE client build is broken due to not following proper code splitting strategy; one file in particularly didn't get split earlier and changes to that file broke the client build on EE.
This PR fixes the issues.
* Fix/16994 refactor common datatype handling (#17429)
* fix:Add array datatype to execute request
* feat: Consume and store type of array elements in Param class (#16994)
* Append param instead of clientDataType in varargs (#16994)
* Refactor common data type handling w.r.t newer structure (#16994)
This commit takes care of the following items:
- It minimizes the number of usage to the older stringToKnownDataTypeConverter method
- Modifies the existing test cases to conform to the newer structure
- Marks stringToKnownDataTypeConverter method as deprecated to discourage further use
* Remove comma delimited numbers from valid test cases (#16994)
* Fix extracting clientDataType from varargs in MySQL (#16994)
* Pass param as a dedicated parameter in json smart replacement (#16994)
* Remove varargs from json smart replacement method (#16994)
* Move BsonType to mongoplugin module (#16994)
* Introduce NullArrayType and refactor BsonType test cases (#16994)
* Add new test cases on numeric string with leading zero (#16994)
* Refactor test case name (#16994)
* Add comment on the ordering of Json and Bson types (#16994)
* Add comment on the ordering of Json and Bson types (#16994)
* Add NullArrayType in Postgres and introduce postgres-specific types (#16994)
* Add data type test cases for Postgres and change as per review comments (#16994)
Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
* feat: Update invite modal submit when we have tabs in modal (#17608)
## Description
> Update invite modal submit when we have tabs in modal.
Fixes [#16741](https://github.com/appsmithorg/appsmith/issues/16741)
## Type of change
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
> Tested it locally.
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
* feat: AST based entity refactor (#17434)
* task: AST based entity refactor
* implemented refactor logic
* jest cases with string manipulation using AST logic
* comments and indentation
* added evalVersion to request
* chore: Added feature flag for datasource environments (#17657)
chore: Added Feature flag for datasource environments
* chore: Corrected analytics event for instance setting events (#17622)
* Update top contributors
* Fix typo in cloud-hosting check and NPE from Segment (#17692)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* fix: remove file references on click of cancel button (#17664)
* fix: table does not show data issue fixed (#17459)
* chore: Add recommended indexes (#17704)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* chore: Added workspace details to user invite analytic event (#17644)
## Description
This PR adds the workspace details to user invite analytics event
## Type of change
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Manually on local
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] 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
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
* chore: Correct the toast font on windows (#17671)
* fix: JS option missing for Label Font Style in Input widget (#17631)
* fix: replace time based action to event based (#17586)
* fix: replace time based action to event based
- The delete datasource button was getting reset to it's original state after a static time of 2200ms
- Replaced this to reset on completion of deletion instead
* fix: removed unused functions
* fix: updated the condition to show confirm delete icon
* Updated Label Config
* test: Add cypress tests for template phase 2 (#17036)
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
* Change Segment CDN to our proxy (#17714)
* chore: Fixing prettier formatting for AnalyticsUtil.tsx
* chore: Adding base repository function to add user permissions to generic domain object (#17733)
## Description
Adding base function to set the user permissions for a user in any domain object.
As part of this, we also add default permission group to the `SeedMongoData`. Without this fix, the JUnit tests go into an infinite loop. Also fixing the `ExampleWorkspaceClonerTest` file.
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
- JUnit
## Checklist:
- [ ] 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
* Update top contributors
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Co-authored-by: Nidhi <nidhi@appsmith.com>
Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: f0c1s <anubhav@appsmith.com>
Co-authored-by: Dhruvik Neharia <dhruvik@appsmith.com>
Co-authored-by: Hetu Nandu <hetu@appsmith.com>
Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com>
Co-authored-by: Appsmith Bot <74705725+appsmith-bot@users.noreply.github.com>
Co-authored-by: Vaibhav Tanwar <40293928+vaibh1297@users.noreply.github.com>
Co-authored-by: subratadeypappu <subrata@appsmith.com>
Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
Co-authored-by: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com>
Co-authored-by: Vishnu Gp <vishnu@appsmith.com>
Co-authored-by: Keyur Paralkar <keyur@appsmith.com>
Co-authored-by: sneha122 <sneha@appsmith.com>
Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com>
Co-authored-by: sanjus-robotic-studio <58104863+sanjus-robotic-studio@users.noreply.github.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com>
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com>
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Co-authored-by: Nidhi <nidhi@appsmith.com>
Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: f0c1s <anubhav@appsmith.com>
Co-authored-by: Dhruvik Neharia <dhruvik@appsmith.com>
Co-authored-by: Hetu Nandu <hetu@appsmith.com>
Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com>
Co-authored-by: Appsmith Bot <74705725+appsmith-bot@users.noreply.github.com>
Co-authored-by: Vaibhav Tanwar <40293928+vaibh1297@users.noreply.github.com>
Co-authored-by: subratadeypappu <subrata@appsmith.com>
Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
Co-authored-by: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com>
Co-authored-by: Vishnu Gp <vishnu@appsmith.com>
Co-authored-by: Keyur Paralkar <keyur@appsmith.com>
Co-authored-by: sneha122 <sneha@appsmith.com>
Co-authored-by: sanjus-robotic-studio <58104863+sanjus-robotic-studio@users.noreply.github.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com>
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2022-10-31 01:24:47 +00:00
|
|
|
import { Classes, Icon, IconSize, Text, TextType } from "design-system";
|
2021-06-07 05:13:16 +00:00
|
|
|
import styled from "styled-components";
|
|
|
|
|
import { FieldArray } from "redux-form";
|
|
|
|
|
import { ControlProps } from "./BaseControl";
|
|
|
|
|
|
|
|
|
|
const CenteredIcon = styled(Icon)`
|
2021-10-20 09:33:04 +00:00
|
|
|
margin-top: 26px;
|
2021-06-07 05:13:16 +00:00
|
|
|
&.hide {
|
|
|
|
|
opacity: 0;
|
|
|
|
|
pointer-events: none;
|
|
|
|
|
}
|
|
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
const PrimaryBox = styled.div`
|
|
|
|
|
display: flex;
|
2021-09-06 05:53:46 +00:00
|
|
|
width: min-content;
|
2021-06-07 05:13:16 +00:00
|
|
|
flex-direction: column;
|
|
|
|
|
border: 2px solid ${(props) => props.theme.colors.apiPane.dividerBg};
|
|
|
|
|
padding: 10px;
|
|
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
const SecondaryBox = styled.div`
|
|
|
|
|
display: flex;
|
|
|
|
|
flex-direction: row;
|
2021-09-06 05:53:46 +00:00
|
|
|
width: min-content;
|
2021-06-07 05:13:16 +00:00
|
|
|
align-items: center;
|
|
|
|
|
justify-content: space-between;
|
|
|
|
|
padding: 5px;
|
2021-10-20 09:33:04 +00:00
|
|
|
|
|
|
|
|
& > div {
|
|
|
|
|
margin-right: 8px;
|
|
|
|
|
height: 60px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
& > .t--form-control-QUERY_DYNAMIC_INPUT_TEXT > div {
|
|
|
|
|
width: 20vw !important;
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-16 09:55:58 +00:00
|
|
|
& > .t--form-control-DROP_DOWN,
|
2021-10-20 09:33:04 +00:00
|
|
|
& > .t--form-control-DROP_DOWN > div > div,
|
|
|
|
|
& > .t--form-control-DROP_DOWN > div > div > div > div {
|
2021-11-16 09:55:58 +00:00
|
|
|
width: 12vw;
|
2021-10-20 09:33:04 +00:00
|
|
|
}
|
2021-06-07 05:13:16 +00:00
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
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) {
|
2022-04-07 16:18:29 +00:00
|
|
|
props.fields.push({ path: "", value: "" });
|
2021-06-07 05:13:16 +00:00
|
|
|
}
|
|
|
|
|
}, [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}`,
|
2022-05-18 14:37:47 +00:00
|
|
|
customStyles: {
|
|
|
|
|
width: "20vw",
|
|
|
|
|
...props.customStyles,
|
|
|
|
|
},
|
2021-06-07 05:13:16 +00:00
|
|
|
};
|
|
|
|
|
return (
|
|
|
|
|
<FormControl
|
|
|
|
|
config={sch}
|
|
|
|
|
formName={props.formName}
|
|
|
|
|
key={idx}
|
|
|
|
|
/>
|
|
|
|
|
);
|
|
|
|
|
})}
|
|
|
|
|
<CenteredIcon
|
|
|
|
|
name="delete"
|
2022-08-22 05:09:39 +00:00
|
|
|
onClick={(e: React.MouseEvent) => {
|
2021-06-07 05:13:16 +00:00
|
|
|
e.stopPropagation();
|
|
|
|
|
props.fields.remove(index);
|
|
|
|
|
}}
|
|
|
|
|
size={IconSize.XXL}
|
|
|
|
|
/>
|
|
|
|
|
</SecondaryBox>
|
|
|
|
|
);
|
|
|
|
|
})}
|
2022-04-07 16:18:29 +00:00
|
|
|
<AddMoreAction onClick={() => props.fields.push({ path: "", value: "" })}>
|
2021-06-07 05:13:16 +00:00
|
|
|
{/*Hardcoded label to be removed */}
|
|
|
|
|
<Text type={TextType.H5}>+ Add Condition (And)</Text>
|
|
|
|
|
</AddMoreAction>
|
|
|
|
|
</PrimaryBox>
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export default function FieldArrayControl(props: FieldArrayControlProps) {
|
2021-12-27 12:04:45 +00:00
|
|
|
const { configProperty, formName, schema } = props;
|
2021-06-07 05:13:16 +00:00
|
|
|
return (
|
2021-12-27 12:04:45 +00:00
|
|
|
<FieldArray
|
|
|
|
|
component={NestedComponents}
|
|
|
|
|
name={configProperty}
|
|
|
|
|
props={{ formName, schema }}
|
|
|
|
|
rerenderOnEveryChange={false}
|
|
|
|
|
/>
|
2021-06-07 05:13:16 +00:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export type FieldArrayControlProps = ControlProps;
|