## 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>
156 lines
4.4 KiB
TypeScript
156 lines
4.4 KiB
TypeScript
import React from "react";
|
|
import type { ControlProps } from "./BaseControl";
|
|
import BaseControl from "./BaseControl";
|
|
import type { ControlType } from "constants/PropertyControlConstants";
|
|
import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField";
|
|
import type { AppState } from "@appsmith/reducers";
|
|
import { formValueSelector } from "redux-form";
|
|
import { QUERY_EDITOR_FORM_NAME } from "@appsmith/constants/forms";
|
|
import { connect } from "react-redux";
|
|
import { actionPathFromName } from "components/formControls/utils";
|
|
import {
|
|
EditorModes,
|
|
EditorSize,
|
|
} from "components/editorComponents/CodeEditor/EditorConfig";
|
|
import styled from "styled-components";
|
|
import _ from "lodash";
|
|
|
|
// Enum for the different types of input fields
|
|
export enum INPUT_TEXT_INPUT_TYPES {
|
|
TEXT = "TEXT",
|
|
PASSWORD = "PASSWORD",
|
|
JSON = "JSON",
|
|
TEXT_WITH_BINDING = "TEXT_WITH_BINDING",
|
|
}
|
|
|
|
const StyledDynamicTextField = styled(DynamicTextField)`
|
|
.CodeEditorTarget .CodeMirror.CodeMirror-wrap {
|
|
background-color: var(--ads-v2-color-bg);
|
|
}
|
|
.CodeEditorTarget .CodeMirror.CodeMirror-wrap:hover {
|
|
background-color: var(--ads-v2-color-bg);
|
|
border-color: var(--ads-v2-color-border-emphasis);
|
|
}
|
|
&&& .t--code-editor-wrapper {
|
|
border: none;
|
|
}
|
|
.CodeEditorTarget {
|
|
border-radius: var(--ads-v2-border-radius);
|
|
}
|
|
`;
|
|
|
|
// Functional component for the DYNAMIC_INPUT_TEXT_CONTROL
|
|
export function InputText(props: {
|
|
label: string;
|
|
placeholder?: string;
|
|
isRequired?: boolean;
|
|
name: string;
|
|
actionName: string;
|
|
inputType?: INPUT_TEXT_INPUT_TYPES;
|
|
customStyles?: any;
|
|
disabled?: boolean;
|
|
showLineNumbers?: boolean;
|
|
}) {
|
|
const { actionName, inputType, name, placeholder } = props;
|
|
const dataTreePath = actionPathFromName(actionName, name);
|
|
let editorProps = {};
|
|
|
|
// Set the editor props to enable JSON editing experience
|
|
if (!!inputType && inputType === INPUT_TEXT_INPUT_TYPES.JSON) {
|
|
editorProps = {
|
|
mode: EditorModes.JSON,
|
|
size: EditorSize.EXTENDED,
|
|
};
|
|
}
|
|
|
|
// Set the editor props to enable JSON editing experience
|
|
if (!!inputType && inputType === INPUT_TEXT_INPUT_TYPES.TEXT_WITH_BINDING) {
|
|
editorProps = {
|
|
mode: EditorModes.TEXT_WITH_BINDING,
|
|
size: EditorSize.EXTENDED,
|
|
};
|
|
}
|
|
|
|
let customStyle = { width: "270px", minHeight: "36px" };
|
|
if (!!props.customStyles && _.isEmpty(props.customStyles) === false) {
|
|
customStyle = { ...props.customStyles };
|
|
if ("width" in props.customStyles) {
|
|
customStyle.width = props.customStyles.width;
|
|
}
|
|
if ("minHeight" in props.customStyles) {
|
|
customStyle.minHeight = props.customStyles.minHeight;
|
|
}
|
|
}
|
|
return (
|
|
<div className={`t--${props?.name}`} style={customStyle}>
|
|
{/* <div style={customStyle}> */}
|
|
<StyledDynamicTextField
|
|
dataTreePath={dataTreePath}
|
|
disabled={props.disabled}
|
|
evaluatedPopUpLabel={props?.label || ""}
|
|
name={name}
|
|
placeholder={placeholder}
|
|
showLightningMenu={false}
|
|
showLineNumbers={props.showLineNumbers}
|
|
{...editorProps}
|
|
/>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
// This is a custom control that is used for dynamic input text fields in the forms for datsources and queries
|
|
class DynamicInputTextControl extends BaseControl<DynamicInputControlProps> {
|
|
render() {
|
|
const {
|
|
actionName,
|
|
configProperty,
|
|
customStyles,
|
|
disabled,
|
|
inputType,
|
|
label,
|
|
placeholderText,
|
|
showLineNumbers,
|
|
} = this.props;
|
|
|
|
let inputTypeProp = inputType;
|
|
if (!inputType) {
|
|
inputTypeProp = INPUT_TEXT_INPUT_TYPES.TEXT;
|
|
}
|
|
|
|
return (
|
|
<InputText
|
|
actionName={actionName}
|
|
customStyles={customStyles}
|
|
disabled={disabled}
|
|
inputType={inputTypeProp}
|
|
label={label}
|
|
name={configProperty}
|
|
placeholder={placeholderText}
|
|
showLineNumbers={showLineNumbers}
|
|
/>
|
|
);
|
|
}
|
|
|
|
getControlType(): ControlType {
|
|
return "QUERY_DYNAMIC_INPUT_TEXT";
|
|
}
|
|
}
|
|
|
|
export interface DynamicInputControlProps extends ControlProps {
|
|
placeholderText: string;
|
|
actionName: string;
|
|
inputType?: INPUT_TEXT_INPUT_TYPES;
|
|
}
|
|
|
|
const mapStateToProps = (state: AppState, props: DynamicInputControlProps) => {
|
|
const valueSelector = formValueSelector(
|
|
props.formName || QUERY_EDITOR_FORM_NAME,
|
|
);
|
|
const actionName = valueSelector(state, "name");
|
|
return {
|
|
actionName: actionName,
|
|
};
|
|
};
|
|
|
|
export default connect(mapStateToProps)(DynamicInputTextControl);
|