## 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>
313 lines
8.7 KiB
TypeScript
313 lines
8.7 KiB
TypeScript
import React from "react";
|
|
import { isString } from "lodash";
|
|
|
|
import type { ControlProps } from "./BaseControl";
|
|
import BaseControl from "./BaseControl";
|
|
import { StyledDynamicInput } from "./StyledControls";
|
|
import type { CodeEditorExpected } from "components/editorComponents/CodeEditor";
|
|
import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
|
|
import {
|
|
EditorModes,
|
|
EditorSize,
|
|
TabBehaviour,
|
|
} from "components/editorComponents/CodeEditor/EditorConfig";
|
|
import { getDynamicBindings, isDynamicValue } from "utils/DynamicBindingUtils";
|
|
import styled from "styled-components";
|
|
import type { JSONFormWidgetProps } from "widgets/JSONFormWidget/widget";
|
|
import type { Schema, SchemaItem } from "widgets/JSONFormWidget/constants";
|
|
import {
|
|
ARRAY_ITEM_KEY,
|
|
DataType,
|
|
FIELD_TYPE_TO_POTENTIAL_DATA,
|
|
getBindingTemplate,
|
|
ROOT_SCHEMA_KEY,
|
|
} from "widgets/JSONFormWidget/constants";
|
|
import LazyCodeEditor from "components/editorComponents/LazyCodeEditor";
|
|
|
|
const PromptMessage = styled.span`
|
|
line-height: 17px;
|
|
|
|
> .code-wrapper {
|
|
font-family: var(--ads-v2-font-family-code);
|
|
display: inline-flex;
|
|
align-items: center;
|
|
}
|
|
`;
|
|
const CurlyBraces = styled.span`
|
|
color: var(--ads-v2-color-fg);
|
|
background-color: var(--ads-v2-color-bg-muted);
|
|
border-radius: 2px;
|
|
padding: 2px;
|
|
margin: 0 2px 0 0;
|
|
font-size: 10px;
|
|
font-weight: var(--ads-v2-font-weight-bold);
|
|
`;
|
|
|
|
// Auxiliary function for processArray, which returns the value for an object field
|
|
function processObject(schema: Schema, defaultValue?: any) {
|
|
const obj: Record<string, any> = {};
|
|
|
|
Object.values(schema).forEach((schemaItem) => {
|
|
obj[schemaItem.accessor] = processSchemaItemAutocomplete(
|
|
schemaItem,
|
|
defaultValue,
|
|
);
|
|
});
|
|
|
|
return obj;
|
|
}
|
|
|
|
// Auxiliary function for processArray, which returns the value for an array field
|
|
function processArray(schema: Schema, defaultValue?: any): any[] {
|
|
if (schema[ARRAY_ITEM_KEY]) {
|
|
return [
|
|
processSchemaItemAutocomplete(schema[ARRAY_ITEM_KEY], defaultValue),
|
|
];
|
|
}
|
|
|
|
return [];
|
|
}
|
|
|
|
/**
|
|
* This function takes a schemaItem, traverses through it and creates an object out of it. This
|
|
* object would look like the form data and this object would be used for autocomplete.
|
|
* Eg - {
|
|
* fieldType: object,
|
|
* children: {
|
|
* name: {
|
|
* accessor: "name"
|
|
* fieldType: "string"
|
|
* },
|
|
* age: {
|
|
* accessor: "आयु"
|
|
* fieldType: "number"
|
|
* }
|
|
* }
|
|
* }
|
|
*
|
|
* @returns
|
|
* {
|
|
* name: "",
|
|
* आयु: 0
|
|
* }
|
|
*
|
|
* @param schema
|
|
* @param defaultValue Values that the autocomplete should show for a particular field
|
|
*/
|
|
export function processSchemaItemAutocomplete(
|
|
schemaItem: SchemaItem,
|
|
defaultValue?: any,
|
|
) {
|
|
if (schemaItem.dataType === DataType.OBJECT) {
|
|
return processObject(schemaItem.children, defaultValue);
|
|
}
|
|
|
|
if (schemaItem.dataType === DataType.ARRAY) {
|
|
return processArray(schemaItem.children, defaultValue);
|
|
}
|
|
|
|
return defaultValue || FIELD_TYPE_TO_POTENTIAL_DATA[schemaItem.fieldType];
|
|
}
|
|
|
|
export function InputText(props: {
|
|
label: string;
|
|
value: string;
|
|
onChange: (event: React.ChangeEvent<HTMLTextAreaElement> | string) => void;
|
|
evaluatedValue?: any;
|
|
expected?: CodeEditorExpected;
|
|
placeholder?: string;
|
|
dataTreePath?: string;
|
|
additionalDynamicData: Record<string, Record<string, any>>;
|
|
theme: EditorTheme;
|
|
}) {
|
|
const {
|
|
additionalDynamicData,
|
|
dataTreePath,
|
|
evaluatedValue,
|
|
expected,
|
|
onChange,
|
|
placeholder,
|
|
theme,
|
|
value,
|
|
} = props;
|
|
return (
|
|
<StyledDynamicInput>
|
|
<LazyCodeEditor
|
|
AIAssisted
|
|
additionalDynamicData={additionalDynamicData}
|
|
dataTreePath={dataTreePath}
|
|
evaluatedValue={evaluatedValue}
|
|
expected={expected}
|
|
input={{
|
|
value: value,
|
|
onChange: onChange,
|
|
}}
|
|
mode={EditorModes.TEXT_WITH_BINDING}
|
|
placeholder={placeholder}
|
|
promptMessage={
|
|
<PromptMessage>
|
|
Access the current form using{" "}
|
|
<span className="code-wrapper">
|
|
<CurlyBraces>{"{{"}</CurlyBraces>
|
|
sourceData.fieldName
|
|
<CurlyBraces>{"}}"}</CurlyBraces>
|
|
</span>
|
|
</PromptMessage>
|
|
}
|
|
size={EditorSize.EXTENDED}
|
|
tabBehaviour={TabBehaviour.INDENT}
|
|
theme={theme}
|
|
/>
|
|
</StyledDynamicInput>
|
|
);
|
|
}
|
|
|
|
export const stringToJS = (string: string): string => {
|
|
const { jsSnippets, stringSegments } = getDynamicBindings(string);
|
|
const js = stringSegments
|
|
.map((segment, index) => {
|
|
if (jsSnippets[index] && jsSnippets[index].length > 0) {
|
|
return jsSnippets[index];
|
|
} else {
|
|
return `\`${segment}\``;
|
|
}
|
|
})
|
|
.join(" + ");
|
|
return js;
|
|
};
|
|
|
|
export const JSToString = (js: string): string => {
|
|
const segments = js.split(" + ");
|
|
return segments
|
|
.map((segment) => {
|
|
if (segment.charAt(0) === "`") {
|
|
return segment.substring(1, segment.length - 1);
|
|
} else return "{{" + segment + "}}";
|
|
})
|
|
.join("");
|
|
};
|
|
|
|
class JSONFormComputeControl extends BaseControl<JSONFormComputeControlProps> {
|
|
static getInputComputedValue = (
|
|
propertyValue: string,
|
|
widgetName: string,
|
|
) => {
|
|
if (!isDynamicValue(propertyValue)) return propertyValue;
|
|
|
|
const { prefixTemplate, suffixTemplate } = getBindingTemplate(widgetName);
|
|
|
|
const value = propertyValue.substring(
|
|
prefixTemplate.length,
|
|
propertyValue.length - suffixTemplate.length,
|
|
);
|
|
|
|
return JSToString(value);
|
|
};
|
|
|
|
getComputedValue = (value: string) => {
|
|
const { widgetName } = this.props.widgetProperties;
|
|
|
|
/**
|
|
* If the input value is not a binding then there is no need of adding binding template
|
|
* to the value as it would be of no use.
|
|
*
|
|
* Original motivation of doing this to allow REGEX to work. If the value is REGEX, eg - ^\d+$ and the
|
|
* binding template is added, the REGEX is processed by evaluation and the "\" is considered as a escape and
|
|
* is removed from the final value and the regex become ^d+$. In order to make it work inside a binding the "\"
|
|
* has to be escaped by doing ^\\d+$.
|
|
* As the user is unaware of this binding template being added under the hood, it is not obvious for the user
|
|
* to escape the "\".
|
|
* Thus now we only add the binding template around a value only if the original value has a binding as that could
|
|
* be an indication of the usage of formData/sourceData/fieldState in the value.
|
|
*/
|
|
if (!isDynamicValue(value)) return value;
|
|
|
|
const stringToEvaluate = stringToJS(value);
|
|
const { prefixTemplate, suffixTemplate } = getBindingTemplate(widgetName);
|
|
|
|
if (stringToEvaluate === "") {
|
|
return stringToEvaluate;
|
|
}
|
|
|
|
return `${prefixTemplate}${stringToEvaluate}${suffixTemplate}`;
|
|
};
|
|
|
|
onTextChange = (event: React.ChangeEvent<HTMLTextAreaElement> | string) => {
|
|
const value = isString(event) ? event : event.target?.value;
|
|
const output = this.getComputedValue(value);
|
|
|
|
this.updateProperty(this.props.propertyName, output);
|
|
};
|
|
|
|
render() {
|
|
const {
|
|
dataTreePath,
|
|
defaultValue,
|
|
expected,
|
|
label,
|
|
placeholderText,
|
|
propertyValue,
|
|
theme,
|
|
widgetProperties,
|
|
} = this.props;
|
|
|
|
const { schema } = widgetProperties;
|
|
const rootSchemaItem = schema[ROOT_SCHEMA_KEY] || {};
|
|
const { sourceData } = rootSchemaItem;
|
|
|
|
const baseSchemaStructure = processSchemaItemAutocomplete(rootSchemaItem);
|
|
|
|
const fieldStateStructure = processSchemaItemAutocomplete(rootSchemaItem, {
|
|
isVisible: true,
|
|
isDisabled: true,
|
|
isRequired: true,
|
|
isValid: true,
|
|
});
|
|
|
|
const value = (() => {
|
|
if (propertyValue && isDynamicValue(propertyValue)) {
|
|
const { widgetName } = this.props.widgetProperties;
|
|
return JSONFormComputeControl.getInputComputedValue(
|
|
propertyValue,
|
|
widgetName,
|
|
);
|
|
}
|
|
|
|
return propertyValue || defaultValue;
|
|
})();
|
|
|
|
if (value && !propertyValue) {
|
|
this.onTextChange(value);
|
|
}
|
|
|
|
return (
|
|
<InputText
|
|
additionalDynamicData={{
|
|
sourceData,
|
|
formData: baseSchemaStructure,
|
|
fieldState: fieldStateStructure,
|
|
}}
|
|
dataTreePath={dataTreePath}
|
|
expected={expected}
|
|
label={label}
|
|
onChange={this.onTextChange}
|
|
placeholder={placeholderText}
|
|
theme={theme}
|
|
value={value}
|
|
/>
|
|
);
|
|
}
|
|
|
|
static getControlType() {
|
|
return "JSON_FORM_COMPUTE_VALUE";
|
|
}
|
|
}
|
|
|
|
export interface JSONFormComputeControlProps extends ControlProps {
|
|
defaultValue?: string;
|
|
widgetProperties: JSONFormWidgetProps;
|
|
placeholderText?: string;
|
|
}
|
|
|
|
export default JSONFormComputeControl;
|