## 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>
267 lines
7.5 KiB
TypeScript
267 lines
7.5 KiB
TypeScript
import React from "react";
|
|
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 { isDynamicValue } from "utils/DynamicBindingUtils";
|
|
import styled from "styled-components";
|
|
import { isString } from "utils/helpers";
|
|
import {
|
|
JSToString,
|
|
stringToJS,
|
|
} from "components/editorComponents/ActionCreator/utils";
|
|
import type { AdditionalDynamicDataTree } from "utils/autocomplete/customTreeTypeDefCreator";
|
|
import type { ColumnProperties } from "widgets/TableWidgetV2/component/Constants";
|
|
import { getUniqueKeysFromSourceData } from "widgets/MenuButtonWidget/widget/helper";
|
|
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);
|
|
`;
|
|
|
|
type InputTextProp = {
|
|
label: string;
|
|
value: string;
|
|
onChange: (event: React.ChangeEvent<HTMLTextAreaElement> | string) => void;
|
|
evaluatedValue?: any;
|
|
expected?: CodeEditorExpected;
|
|
placeholder?: string;
|
|
dataTreePath?: string;
|
|
additionalDynamicData: AdditionalDynamicDataTree;
|
|
theme: EditorTheme;
|
|
};
|
|
|
|
function InputText(props: InputTextProp) {
|
|
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 item using{" "}
|
|
<span className="code-wrapper">
|
|
<CurlyBraces>{"{{"}</CurlyBraces>
|
|
currentItem
|
|
<CurlyBraces>{"}}"}</CurlyBraces>
|
|
</span>
|
|
</PromptMessage>
|
|
}
|
|
size={EditorSize.EXTENDED}
|
|
tabBehaviour={TabBehaviour.INDENT}
|
|
theme={theme}
|
|
/>
|
|
</StyledDynamicInput>
|
|
);
|
|
}
|
|
|
|
class MenuButtonDynamicItemsControl extends BaseControl<MenuButtonDynamicItemsControlProps> {
|
|
render() {
|
|
const {
|
|
dataTreePath,
|
|
defaultValue,
|
|
expected,
|
|
label,
|
|
propertyValue,
|
|
theme,
|
|
widgetProperties,
|
|
} = this.props;
|
|
const widgetName = widgetProperties.widgetName;
|
|
const widgetType = widgetProperties.type;
|
|
const value =
|
|
propertyValue && isDynamicValue(propertyValue)
|
|
? MenuButtonDynamicItemsControl.getInputComputedValue(
|
|
propertyValue,
|
|
widgetName,
|
|
widgetType,
|
|
widgetProperties.primaryColumns,
|
|
)
|
|
: propertyValue
|
|
? propertyValue
|
|
: defaultValue;
|
|
let sourceData;
|
|
|
|
if (widgetType === "TABLE_WIDGET_V2") {
|
|
sourceData =
|
|
widgetProperties?.__evaluation__?.evaluatedValues?.primaryColumns?.[
|
|
`${Object.keys(widgetProperties.primaryColumns)[0]}`
|
|
]?.sourceData;
|
|
} else if (widgetType === "MENU_BUTTON_WIDGET") {
|
|
sourceData =
|
|
widgetProperties?.__evaluation__?.evaluatedValues?.sourceData;
|
|
}
|
|
|
|
const keys = getUniqueKeysFromSourceData(sourceData);
|
|
const currentItem: { [key: string]: any } = {};
|
|
|
|
Object.values(keys).forEach((key) => {
|
|
currentItem[key as keyof typeof currentItem] = undefined;
|
|
});
|
|
|
|
// Load default value in evaluated value
|
|
if (value && !propertyValue) {
|
|
this.onTextChange(value);
|
|
}
|
|
|
|
return (
|
|
<InputText
|
|
additionalDynamicData={{
|
|
currentItem,
|
|
currentIndex: -1,
|
|
}}
|
|
dataTreePath={dataTreePath}
|
|
expected={expected}
|
|
label={label}
|
|
onChange={this.onTextChange}
|
|
theme={theme}
|
|
value={value}
|
|
/>
|
|
);
|
|
}
|
|
|
|
static getBindingPrefix = (
|
|
widgetName: string,
|
|
widgetType?: string,
|
|
primaryColumns?: Record<string, ColumnProperties>,
|
|
) => {
|
|
if (widgetType === "TABLE_WIDGET_V2" && primaryColumns) {
|
|
const columnName = Object.keys(primaryColumns)?.[0];
|
|
|
|
return `{{${widgetName}.processedTableData.map((currentRow, currentRowIndex) => {
|
|
let primaryColumnData = [];
|
|
|
|
if (${widgetName}.primaryColumns.${columnName}.sourceData[currentRowIndex].length) {
|
|
primaryColumnData = ${widgetName}.primaryColumns.${columnName}.sourceData[currentRowIndex];
|
|
} else if (${widgetName}.primaryColumns.${columnName}.sourceData.length) {
|
|
primaryColumnData = ${widgetName}.primaryColumns.${columnName}.sourceData;
|
|
}
|
|
|
|
return primaryColumnData.map((currentItem, currentIndex) => `;
|
|
} else {
|
|
return `{{${widgetName}.sourceData.map((currentItem, currentIndex) => ( `;
|
|
}
|
|
};
|
|
|
|
static getBindingSuffix = (widgetType?: string) =>
|
|
widgetType === "TABLE_WIDGET_V2" ? `);});}}` : `))}}`;
|
|
|
|
static getInputComputedValue = (
|
|
propertyValue: string,
|
|
widgetName: string,
|
|
widgetType?: string,
|
|
primaryColumns?: Record<string, ColumnProperties>,
|
|
) => {
|
|
if (
|
|
!propertyValue.includes(
|
|
this.getBindingPrefix(widgetName, widgetType, primaryColumns),
|
|
)
|
|
) {
|
|
return propertyValue;
|
|
}
|
|
|
|
const value = `${propertyValue.substring(
|
|
this.getBindingPrefix(widgetName, widgetType, primaryColumns).length,
|
|
propertyValue.length - this.getBindingSuffix(widgetType).length,
|
|
)}`;
|
|
const stringValue = JSToString(value);
|
|
|
|
return stringValue;
|
|
};
|
|
|
|
getComputedValue = (
|
|
value: string,
|
|
widgetName: string,
|
|
widgetType?: string,
|
|
primaryColumns?: Record<string, ColumnProperties>,
|
|
) => {
|
|
if (!isDynamicValue(value)) {
|
|
return value;
|
|
}
|
|
|
|
const stringToEvaluate = stringToJS(value);
|
|
|
|
if (stringToEvaluate === "") {
|
|
return stringToEvaluate;
|
|
}
|
|
|
|
return `${MenuButtonDynamicItemsControl.getBindingPrefix(
|
|
widgetName,
|
|
widgetType,
|
|
primaryColumns,
|
|
)}${stringToEvaluate}${MenuButtonDynamicItemsControl.getBindingSuffix(
|
|
widgetType,
|
|
)}`;
|
|
};
|
|
|
|
onTextChange = (event: React.ChangeEvent<HTMLTextAreaElement> | string) => {
|
|
let value = "";
|
|
if (typeof event !== "string") {
|
|
value = event.target?.value;
|
|
} else {
|
|
value = event;
|
|
}
|
|
if (isString(value)) {
|
|
const output = this.getComputedValue(
|
|
value,
|
|
this.props.widgetProperties.widgetName,
|
|
this.props.widgetProperties.type,
|
|
this.props.widgetProperties.primaryColumns,
|
|
);
|
|
|
|
this.updateProperty(this.props.propertyName, output);
|
|
} else {
|
|
this.updateProperty(this.props.propertyName, value);
|
|
}
|
|
};
|
|
|
|
static getControlType() {
|
|
return "MENU_BUTTON_DYNAMIC_ITEMS";
|
|
}
|
|
}
|
|
|
|
export interface MenuButtonDynamicItemsControlProps extends ControlProps {
|
|
defaultValue?: string;
|
|
}
|
|
|
|
export default MenuButtonDynamicItemsControl;
|