## 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
3.6 KiB
TypeScript
156 lines
3.6 KiB
TypeScript
import styled from "styled-components";
|
|
import React from "react";
|
|
|
|
import Edit from "assets/images/EditPen.svg";
|
|
import ErrorTooltip from "components/editorComponents/ErrorTooltip";
|
|
import {
|
|
FIELD_REQUIRED_ERROR,
|
|
VALID_FUNCTION_NAME_ERROR,
|
|
UNIQUE_NAME_ERROR,
|
|
createMessage,
|
|
} from "@appsmith/constants/messages";
|
|
|
|
const InputContainer = styled.div<{ focused: boolean; isValid: boolean }>`
|
|
align-items: center;
|
|
display: flex;
|
|
position: relative;
|
|
width: 250px;
|
|
input {
|
|
padding: 3px 6px;
|
|
margin-left: 10px;
|
|
transition: font-size 0.2s;
|
|
font-size: ${(props) => (props.focused ? "17px" : "18px")};
|
|
border 1px solid;
|
|
border-radius: 3px;
|
|
border-color: ${(props) => {
|
|
let color = props.focused ? "hsl(0,0%,80%)" : "white";
|
|
color = !props.isValid ? "red" : color;
|
|
return color;
|
|
}};
|
|
display: block;
|
|
width: 100%;
|
|
font-weight: 200;
|
|
line-height: 24px;
|
|
text-overflow: ellipsis;
|
|
:hover {
|
|
border-color: hsl(0, 0 %, 80 %);
|
|
cursor: ${(props) => (props.focused ? "auto" : "pointer")};
|
|
}
|
|
}
|
|
`;
|
|
|
|
const EditPen = styled.img`
|
|
height: 14px;
|
|
width: 14px;
|
|
position: absolute;
|
|
right: 7px;
|
|
:hover {
|
|
cursor: pointer;
|
|
}
|
|
`;
|
|
|
|
export function validateEntityName(name: string, allNames?: string[]) {
|
|
const validation = {
|
|
isValid: true,
|
|
validationMessage: "",
|
|
};
|
|
|
|
if (!/^[a-zA-Z_][0-9a-zA-Z_]*$/.test(name)) {
|
|
validation.isValid = false;
|
|
validation.validationMessage += createMessage(VALID_FUNCTION_NAME_ERROR);
|
|
}
|
|
if (!name) {
|
|
validation.isValid = false;
|
|
validation.validationMessage += createMessage(FIELD_REQUIRED_ERROR);
|
|
}
|
|
|
|
if (
|
|
allNames &&
|
|
allNames.findIndex((entityName) => entityName === name) !== -1
|
|
) {
|
|
validation.isValid = false;
|
|
validation.validationMessage += createMessage(UNIQUE_NAME_ERROR);
|
|
}
|
|
|
|
return validation;
|
|
}
|
|
|
|
interface EntityNameProps {
|
|
onBlur: (event?: any) => void;
|
|
onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
|
|
value: string;
|
|
isValid: boolean;
|
|
validationMessage?: string;
|
|
focusOnMount?: boolean;
|
|
readOnly?: boolean;
|
|
disabled?: boolean;
|
|
placeholder: string;
|
|
}
|
|
|
|
interface EntityNameState {
|
|
focused: boolean;
|
|
}
|
|
|
|
class EntityNameComponent extends React.Component<
|
|
EntityNameProps,
|
|
EntityNameState
|
|
> {
|
|
nameInput!: HTMLInputElement | null;
|
|
|
|
constructor(props: EntityNameProps) {
|
|
super(props);
|
|
|
|
this.state = {
|
|
focused: false,
|
|
};
|
|
}
|
|
|
|
handleFocus = (event: { target: { select: () => any } }) => {
|
|
event.target.select();
|
|
};
|
|
|
|
onFocus = () => {
|
|
this.setState({ focused: true });
|
|
};
|
|
|
|
onBlur = () => {
|
|
this.setState({ focused: false });
|
|
this.props.onBlur();
|
|
};
|
|
|
|
onClickEnter = (event: any) => {
|
|
event.preventDefault();
|
|
event.target.blur();
|
|
};
|
|
|
|
render() {
|
|
const { focused } = this.state;
|
|
const { isValid, onChange, placeholder, validationMessage, value } =
|
|
this.props;
|
|
|
|
return (
|
|
<ErrorTooltip isOpen={!isValid} message={validationMessage || ""}>
|
|
<InputContainer focused={focused} isValid={isValid}>
|
|
<input
|
|
onBlur={this.onBlur}
|
|
onChange={onChange}
|
|
onFocus={this.onFocus}
|
|
onKeyPress={(e) => {
|
|
if (e.key === "Enter") {
|
|
this.onClickEnter(e);
|
|
}
|
|
}}
|
|
placeholder={placeholder}
|
|
value={value}
|
|
/>
|
|
{!focused && (
|
|
<EditPen alt="Edit pen" onClick={this.onFocus} src={Edit} />
|
|
)}
|
|
</InputContainer>
|
|
</ErrorTooltip>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default EntityNameComponent;
|