## Description Added ESLint rule to force blank lines between statements. Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!CAUTION] > 🔴 🔴 🔴 Some tests have failed. > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/10924926728> > Commit: 34f57714a1575ee04e94e03cbcaf95e57a96c86c > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10924926728&attempt=1&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank">Cypress dashboard</a>. > Tags: @tag.All > Spec: > The following are new failures, please fix them before merging the PR: <ol> > <li>cypress/e2e/Regression/ClientSide/Anvil/AnvilModal_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCurrencyInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilIconButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInlineButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilParagraphWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilPhoneInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilStatsWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilToolbarButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilZoneSectionWidgetSnapshot_spec.ts</ol> > <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">List of identified flaky tests</a>. > <hr>Wed, 18 Sep 2024 16:33:36 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No --------- Co-authored-by: Valera Melnikov <valera@appsmith.com>
162 lines
4.6 KiB
TypeScript
162 lines
4.6 KiB
TypeScript
import React from "react";
|
|
import type { ControlProps } from "./BaseControl";
|
|
import BaseControl from "./BaseControl";
|
|
import styled from "styled-components";
|
|
import type { ControlType } from "constants/PropertyControlConstants";
|
|
import { isNil } from "lodash";
|
|
import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
|
|
import { Field } from "redux-form";
|
|
import { connect } from "react-redux";
|
|
import type { AppState } from "ee/reducers";
|
|
import { getDynamicFetchedValues } from "selectors/formSelectors";
|
|
import { change, getFormValues } from "redux-form";
|
|
import type { Action } from "entities/Action";
|
|
import type { SelectOptionProps } from "@appsmith/ads";
|
|
import { SegmentedControl } from "@appsmith/ads";
|
|
|
|
const SegmentedControlWrapper = styled.div<{
|
|
width: string;
|
|
}>`
|
|
/* font-size: 14px; */
|
|
width: ${(props) => (props?.width ? props?.width : "270px")};
|
|
`;
|
|
|
|
class SegementedControl extends BaseControl<Props> {
|
|
render() {
|
|
const styles = {
|
|
// width: "280px",
|
|
...("customStyles" in this.props &&
|
|
typeof this.props.customStyles === "object"
|
|
? this.props.customStyles
|
|
: {}),
|
|
};
|
|
|
|
return (
|
|
<SegmentedControlWrapper
|
|
className={`t--${this?.props?.configProperty}`}
|
|
data-testid={this.props.configProperty}
|
|
style={styles}
|
|
width={styles.width}
|
|
>
|
|
<Field
|
|
component={renderSegementedControl}
|
|
name={this.props.configProperty}
|
|
props={{ ...this.props, width: styles.width }}
|
|
/>
|
|
</SegmentedControlWrapper>
|
|
);
|
|
}
|
|
|
|
getControlType(): ControlType {
|
|
return "SEGMENTED_CONTROL";
|
|
}
|
|
}
|
|
|
|
function renderSegementedControl(
|
|
props: {
|
|
input?: WrappedFieldInputProps;
|
|
meta?: Partial<WrappedFieldMetaProps>;
|
|
width: string;
|
|
} & SegmentedControlProps,
|
|
): JSX.Element {
|
|
let selectedValue: string;
|
|
|
|
//Update selected value
|
|
if (isNil(props.input?.value)) {
|
|
selectedValue = props?.initialValue ? (props.initialValue as string) : "";
|
|
} else {
|
|
selectedValue = props.input?.value;
|
|
}
|
|
|
|
let options: SelectOptionProps[] = [];
|
|
|
|
if (typeof props.options === "object" && Array.isArray(props.options)) {
|
|
options = props.options;
|
|
}
|
|
|
|
//Function to handle selection of options
|
|
const onSelectOptions = (value: string | undefined) => {
|
|
if (!isNil(value)) {
|
|
if (!(selectedValue === value)) {
|
|
selectedValue = value;
|
|
props.input?.onChange(selectedValue);
|
|
}
|
|
}
|
|
};
|
|
|
|
const segmentedOptions = options.map((e) => {
|
|
return { label: e.label, value: e.value };
|
|
});
|
|
|
|
return (
|
|
<SegmentedControl
|
|
defaultValue={props.initialValue as string}
|
|
isFullWidth
|
|
onChange={(value) => onSelectOptions(value)}
|
|
options={segmentedOptions}
|
|
value={selectedValue}
|
|
/>
|
|
);
|
|
}
|
|
|
|
export interface SegmentedControlProps extends ControlProps {
|
|
options: SelectOptionProps[];
|
|
optionWidth?: string;
|
|
placeholderText: string;
|
|
propertyValue: string;
|
|
fetchOptionsConditionally?: boolean;
|
|
isLoading: boolean;
|
|
formValues: Partial<Action>;
|
|
}
|
|
|
|
interface ReduxDispatchProps {
|
|
updateConfigPropertyValue: (
|
|
formName: string,
|
|
field: string,
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
value: any,
|
|
) => void;
|
|
}
|
|
|
|
type Props = SegmentedControlProps & ReduxDispatchProps;
|
|
|
|
const mapStateToProps = (
|
|
state: AppState,
|
|
ownProps: SegmentedControlProps,
|
|
): {
|
|
isLoading: boolean;
|
|
options: SelectOptionProps[];
|
|
formValues: Partial<Action>;
|
|
} => {
|
|
// Added default options to prevent error when options is undefined
|
|
let isLoading = false;
|
|
let options = ownProps.fetchOptionsConditionally ? [] : ownProps.options;
|
|
const formValues: Partial<Action> = getFormValues(ownProps.formName)(state);
|
|
|
|
try {
|
|
if (ownProps.fetchOptionsConditionally) {
|
|
const dynamicFetchedValues = getDynamicFetchedValues(state, ownProps);
|
|
|
|
isLoading = dynamicFetchedValues.isLoading;
|
|
options = dynamicFetchedValues.data;
|
|
}
|
|
} catch (e) {
|
|
} finally {
|
|
return { isLoading, options, formValues };
|
|
}
|
|
};
|
|
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
updateConfigPropertyValue: (formName: string, field: string, value: any) => {
|
|
dispatch(change(formName, field, value));
|
|
},
|
|
});
|
|
|
|
// Connecting this component to the state to allow for dynamic fetching of options to be updated.
|
|
export default connect(mapStateToProps, mapDispatchToProps)(SegementedControl);
|