## 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>
171 lines
4.7 KiB
TypeScript
171 lines
4.7 KiB
TypeScript
import React from "react";
|
|
import type { ColumnProperties } from "widgets/TableWidgetV2/component/Constants";
|
|
import { isDynamicValue } from "utils/DynamicBindingUtils";
|
|
import {
|
|
ORIGINAL_INDEX_KEY,
|
|
PRIMARY_COLUMN_KEY_VALUE,
|
|
} from "widgets/TableWidgetV2/constants";
|
|
import TableInlineEditValidationControlProperty, {
|
|
CurlyBraces,
|
|
StyledCode,
|
|
InputText,
|
|
PromptMessage,
|
|
} from "./TableInlineEditValidationControl";
|
|
import { isString } from "lodash";
|
|
import { JSToString, stringToJS } from "./utils";
|
|
import {
|
|
createMessage,
|
|
TABLE_WIDGET_VALIDATION_ASSIST_PROMPT,
|
|
} from "@appsmith/constants/messages";
|
|
|
|
const bindingPrefix = `{{
|
|
(
|
|
(editedValue, currentRow, currentIndex, isNewRow) => (
|
|
`;
|
|
|
|
const getBindingSuffix = (tableId: string, columnName: string) => {
|
|
return `
|
|
))
|
|
(
|
|
(${tableId}.isAddRowInProgress ? ${tableId}.newRow.${columnName} : ${tableId}.columnEditableCellValue.${columnName}) || "",
|
|
${tableId}.isAddRowInProgress ? ${tableId}.newRow : (${tableId}.processedTableData[${tableId}.editableCell.index] ||
|
|
Object.keys(${tableId}.processedTableData[0])
|
|
.filter(key => ["${ORIGINAL_INDEX_KEY}", "${PRIMARY_COLUMN_KEY_VALUE}"].indexOf(key) === -1)
|
|
.reduce((prev, curr) => {
|
|
prev[curr] = "";
|
|
return prev;
|
|
}, {})),
|
|
${tableId}.isAddRowInProgress ? -1 : ${tableId}.editableCell.index,
|
|
${tableId}.isAddRowInProgress
|
|
)
|
|
}}
|
|
`;
|
|
};
|
|
class TableInlineEditValidPropertyControl extends TableInlineEditValidationControlProperty {
|
|
render() {
|
|
const {
|
|
dataTreePath,
|
|
defaultValue,
|
|
expected,
|
|
label,
|
|
propertyValue,
|
|
theme,
|
|
widgetProperties,
|
|
} = this.props;
|
|
const tableId = widgetProperties.widgetName;
|
|
const value =
|
|
propertyValue && isDynamicValue(propertyValue)
|
|
? this.getInputComputedValue(propertyValue, tableId)
|
|
: propertyValue || defaultValue;
|
|
|
|
const columns: Record<string, ColumnProperties> =
|
|
widgetProperties.primaryColumns || {};
|
|
const currentRow: { [key: string]: any } = {};
|
|
Object.values(columns).forEach((column) => {
|
|
currentRow[column.alias || column.originalId] = undefined;
|
|
});
|
|
// Load default value in evaluated value
|
|
if (value && !propertyValue) {
|
|
this.onTextChange(value);
|
|
}
|
|
|
|
const additionalDynamicData = {
|
|
currentRow,
|
|
currentIndex: -1,
|
|
editedValue: "",
|
|
isNewRow: false,
|
|
};
|
|
|
|
return (
|
|
<InputText
|
|
additionalDynamicData={additionalDynamicData}
|
|
dataTreePath={dataTreePath}
|
|
expected={expected}
|
|
label={label}
|
|
onChange={this.onTextChange}
|
|
promptMessage={
|
|
<PromptMessage>
|
|
{createMessage(TABLE_WIDGET_VALIDATION_ASSIST_PROMPT)}
|
|
<span className="code-wrapper">
|
|
<CurlyBraces>{"{{"}</CurlyBraces>
|
|
<StyledCode>currentRow.columnName</StyledCode>
|
|
<CurlyBraces>{"}}"}</CurlyBraces>
|
|
</span>
|
|
</PromptMessage>
|
|
}
|
|
theme={theme}
|
|
value={value}
|
|
/>
|
|
);
|
|
}
|
|
|
|
getInputComputedValue = (propertyValue: string, tableId: string) => {
|
|
let value;
|
|
|
|
if (propertyValue.indexOf(bindingPrefix) === 0) {
|
|
value = `${propertyValue.substring(
|
|
bindingPrefix.length,
|
|
propertyValue.length -
|
|
getBindingSuffix(tableId, this.getColumnName()).length,
|
|
)}`;
|
|
} else {
|
|
value = propertyValue;
|
|
}
|
|
|
|
return JSToString(value);
|
|
};
|
|
|
|
getComputedValue = (value: string, tableId: string) => {
|
|
if (!isDynamicValue(value)) {
|
|
return value;
|
|
}
|
|
|
|
const stringToEvaluate = stringToJS(value);
|
|
|
|
if (stringToEvaluate === "") {
|
|
return stringToEvaluate;
|
|
}
|
|
|
|
return `${bindingPrefix}${stringToEvaluate}${getBindingSuffix(
|
|
tableId,
|
|
this.getColumnName(),
|
|
)}`;
|
|
};
|
|
|
|
onTextChange = (event: React.ChangeEvent<HTMLTextAreaElement> | string) => {
|
|
const value = typeof event !== "string" ? event.target?.value : event;
|
|
|
|
if (isString(value)) {
|
|
const output = this.getComputedValue(
|
|
value,
|
|
this.props.widgetProperties.widgetName,
|
|
);
|
|
|
|
this.updateProperty(this.props.propertyName, output);
|
|
} else {
|
|
this.updateProperty(this.props.propertyName, value);
|
|
}
|
|
};
|
|
|
|
getColumnName = () => {
|
|
/*
|
|
* Regex to extract the column name from the property path
|
|
*/
|
|
const matchedColumnName = this.props.parentPropertyName.match(
|
|
/primaryColumns\.([^.]+)\.[^.]+\.[^.]+/,
|
|
);
|
|
|
|
if (matchedColumnName) {
|
|
return matchedColumnName[1];
|
|
}
|
|
|
|
return "";
|
|
};
|
|
|
|
static getControlType() {
|
|
return "TABLE_INLINE_EDIT_VALID_PROPERTY_CONTROL";
|
|
}
|
|
}
|
|
|
|
export default TableInlineEditValidPropertyControl;
|