## 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>
210 lines
5.2 KiB
TypeScript
210 lines
5.2 KiB
TypeScript
import React from "react";
|
|
import type { ControlProps } from "./BaseControl";
|
|
import BaseControl from "./BaseControl";
|
|
import type { ControlType } from "constants/PropertyControlConstants";
|
|
import type { AppState } from "@appsmith/reducers";
|
|
import styled from "styled-components";
|
|
import type { InputType } from "components/constants";
|
|
import type { InputTypes as DSInputType } from "design-system";
|
|
import type { WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form";
|
|
import { Field, formValueSelector } from "redux-form";
|
|
import { connect } from "react-redux";
|
|
import { Input } from "design-system";
|
|
|
|
export const StyledInfo = styled.span`
|
|
font-weight: normal;
|
|
line-height: normal;
|
|
color: var(--ads-v2-color-fg);
|
|
font-size: 12px;
|
|
margin-left: 1px;
|
|
`;
|
|
|
|
const FieldWrapper = styled.div`
|
|
position: relative;
|
|
min-width: 380px;
|
|
max-width: 545px;
|
|
`;
|
|
|
|
const SecretDisplayIndicator = styled.input`
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
width: 100%;
|
|
height: 100%;
|
|
display: flex;
|
|
align-items: center;
|
|
padding: 0px var(--ads-spaces-6);
|
|
z-index: 1;
|
|
cursor: text;
|
|
border: none;
|
|
background: none;
|
|
`;
|
|
|
|
const PASSWORD_EXISTS_INDICATOR = "······";
|
|
|
|
function renderComponent(
|
|
props: {
|
|
placeholder: string;
|
|
dataType?: DSInputType;
|
|
disabled?: boolean;
|
|
reference: any;
|
|
validator?: (value: string) => { isValid: boolean; message: string };
|
|
} & {
|
|
meta: Partial<WrappedFieldMetaProps>;
|
|
input: Partial<WrappedFieldInputProps>;
|
|
},
|
|
) {
|
|
return (
|
|
<Input
|
|
errorMessage={props.validator?.(props.input.value).message}
|
|
isDisabled={props.disabled || false}
|
|
isValid={props.validator?.(props.input.value).isValid}
|
|
name={props.input?.name}
|
|
onChange={props.input.onChange}
|
|
placeholder={props.placeholder}
|
|
ref={props.reference}
|
|
size="md"
|
|
type={props.dataType}
|
|
value={props.input.value}
|
|
/>
|
|
);
|
|
}
|
|
|
|
class InputTextControl extends BaseControl<InputControlProps> {
|
|
fieldRef: any;
|
|
|
|
state = {
|
|
secretDisplayVisible: false,
|
|
};
|
|
|
|
constructor(props: InputControlProps) {
|
|
super(props);
|
|
this.fieldRef = React.createRef();
|
|
}
|
|
|
|
onClickSecretDisplayIndicator = () => {
|
|
if (!this.state.secretDisplayVisible) return;
|
|
this.setState({
|
|
secretDisplayVisible: false,
|
|
});
|
|
|
|
if (this.fieldRef.current) this.fieldRef.current?.focus();
|
|
};
|
|
|
|
checkForSecretOverlayIndicator = () => {
|
|
return (
|
|
this.props.dataType === "PASSWORD" &&
|
|
this.props.isSecretExistsPath &&
|
|
this.props.isSecretExistsData
|
|
);
|
|
};
|
|
|
|
onBlur = () => {
|
|
if (
|
|
this.checkForSecretOverlayIndicator() &&
|
|
this.fieldRef.current?.value?.length === 0
|
|
) {
|
|
this.setState({
|
|
secretDisplayVisible: true,
|
|
});
|
|
}
|
|
};
|
|
|
|
componentDidMount() {
|
|
if (this.checkForSecretOverlayIndicator()) {
|
|
this.setState({
|
|
secretDisplayVisible: true,
|
|
});
|
|
}
|
|
}
|
|
|
|
render() {
|
|
const {
|
|
configProperty,
|
|
customStyles,
|
|
dataType,
|
|
disabled,
|
|
encrypted,
|
|
isValid,
|
|
label,
|
|
placeholderText,
|
|
propertyValue,
|
|
subtitle,
|
|
validationMessage,
|
|
validator,
|
|
} = this.props;
|
|
|
|
return (
|
|
<FieldWrapper data-testid={configProperty} style={customStyles || {}}>
|
|
{this.state.secretDisplayVisible && (
|
|
<SecretDisplayIndicator
|
|
onClick={this.onClickSecretDisplayIndicator}
|
|
onFocus={this.onClickSecretDisplayIndicator}
|
|
type="password"
|
|
value={PASSWORD_EXISTS_INDICATOR}
|
|
/>
|
|
)}
|
|
<Field
|
|
asyncControl
|
|
component={renderComponent}
|
|
dataType={this.getType(dataType)}
|
|
disabled={disabled || false}
|
|
encrypted={encrypted}
|
|
isValid={isValid}
|
|
label={label}
|
|
name={configProperty}
|
|
onBlur={this.onBlur}
|
|
onFocus={this.onClickSecretDisplayIndicator}
|
|
placeholder={this.state.secretDisplayVisible ? "" : placeholderText}
|
|
reference={this.fieldRef}
|
|
subtitle={subtitle}
|
|
validationMessage={validationMessage}
|
|
validator={validator}
|
|
value={propertyValue}
|
|
/>
|
|
</FieldWrapper>
|
|
);
|
|
}
|
|
|
|
getType(dataType: InputType | undefined) {
|
|
switch (dataType) {
|
|
case "PASSWORD":
|
|
return "password";
|
|
case "CURRENCY":
|
|
case "INTEGER":
|
|
case "PHONE_NUMBER":
|
|
case "NUMBER":
|
|
return "number";
|
|
default:
|
|
return "text";
|
|
}
|
|
}
|
|
getControlType(): ControlType {
|
|
return "INPUT_TEXT";
|
|
}
|
|
}
|
|
|
|
export interface InputControlProps extends ControlProps {
|
|
placeholderText: string;
|
|
inputType?: InputType;
|
|
dataType?: InputType;
|
|
subtitle?: string;
|
|
encrypted?: boolean;
|
|
disabled?: boolean;
|
|
validator?: (value: string) => { isValid: boolean; message: string };
|
|
isSecretExistsData?: boolean;
|
|
}
|
|
|
|
const mapStateToProps = (state: AppState, props: InputControlProps) => {
|
|
const valueSelector = formValueSelector(props.formName);
|
|
let isSecretExistsData;
|
|
if (props.isSecretExistsPath) {
|
|
isSecretExistsData = valueSelector(state, props.isSecretExistsPath);
|
|
}
|
|
return {
|
|
isSecretExistsData,
|
|
};
|
|
};
|
|
|
|
export default connect(mapStateToProps)(InputTextControl);
|