## 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>
280 lines
8.0 KiB
TypeScript
280 lines
8.0 KiB
TypeScript
import React from "react";
|
|
import log from "loglevel";
|
|
import { klona } from "klona";
|
|
import { isEmpty, isString, maxBy, set, sortBy } from "lodash";
|
|
|
|
import type { ControlProps } from "./BaseControl";
|
|
import BaseControl from "./BaseControl";
|
|
import EmptyDataState from "components/utils/EmptyDataState";
|
|
import SchemaParser, {
|
|
getKeysFromSchema,
|
|
} from "widgets/JSONFormWidget/schemaParser";
|
|
import type { Schema } from "widgets/JSONFormWidget/constants";
|
|
import { ARRAY_ITEM_KEY } from "widgets/JSONFormWidget/constants";
|
|
import { Button } from "design-system";
|
|
import type { BaseItemProps } from "./DraggableListComponent";
|
|
import { DraggableListCard } from "components/propertyControls/DraggableListCard";
|
|
import { getNextEntityName } from "utils/AppsmithUtils";
|
|
import { InputText } from "./InputTextControl";
|
|
import type { JSONFormWidgetProps } from "widgets/JSONFormWidget/widget";
|
|
import { DraggableListControl } from "pages/Editor/PropertyPane/DraggableListControl";
|
|
|
|
type DroppableItem = BaseItemProps & {
|
|
index: number;
|
|
isCustomField: boolean;
|
|
};
|
|
|
|
type State = {
|
|
focusedIndex: number | null;
|
|
};
|
|
|
|
const DEFAULT_FIELD_NAME = "customField";
|
|
|
|
class FieldConfigurationControl extends BaseControl<ControlProps, State> {
|
|
constructor(props: ControlProps) {
|
|
super(props);
|
|
|
|
this.state = {
|
|
focusedIndex: null,
|
|
};
|
|
}
|
|
|
|
isArrayItem = () => {
|
|
const schema: Schema = this.props.propertyValue;
|
|
return Boolean(schema?.[ARRAY_ITEM_KEY]);
|
|
};
|
|
|
|
findSchemaItem = (index: number) => {
|
|
const schema: Schema = this.props.propertyValue;
|
|
const schemaItems = Object.values(schema);
|
|
const sortedSchemaItems = sortBy(schemaItems, ({ position }) => position);
|
|
return sortedSchemaItems[index];
|
|
};
|
|
|
|
onEdit = (index: number) => {
|
|
const schemaItem = this.findSchemaItem(index);
|
|
|
|
if (schemaItem) {
|
|
this.props.openNextPanel({
|
|
...schemaItem,
|
|
propPaneId: this.props.widgetProperties.widgetId,
|
|
});
|
|
}
|
|
};
|
|
|
|
onDeleteOption = (index: number) => {
|
|
const { propertyName } = this.props;
|
|
const schemaItem = this.findSchemaItem(index);
|
|
|
|
if (schemaItem) {
|
|
const itemToDeletePath = `${propertyName}.${schemaItem.identifier}`;
|
|
|
|
this.deleteProperties([itemToDeletePath]);
|
|
}
|
|
};
|
|
|
|
updateOption = (index: number, updatedLabel: string) => {
|
|
const { propertyName } = this.props;
|
|
const schemaItem = this.findSchemaItem(index);
|
|
|
|
if (schemaItem) {
|
|
const { identifier } = schemaItem;
|
|
|
|
this.updateProperty(`${propertyName}.${identifier}.label`, updatedLabel);
|
|
}
|
|
};
|
|
|
|
toggleVisibility = (index: number) => {
|
|
const { propertyName } = this.props;
|
|
const schemaItem = this.findSchemaItem(index);
|
|
|
|
if (schemaItem) {
|
|
const { identifier, isVisible } = schemaItem;
|
|
|
|
this.updateProperty(
|
|
`${propertyName}.${identifier}.isVisible`,
|
|
!isVisible,
|
|
);
|
|
}
|
|
};
|
|
|
|
addNewField = () => {
|
|
if (this.isArrayItem()) return;
|
|
|
|
const { propertyValue = {}, propertyName, widgetProperties } = this.props;
|
|
const { childStylesheet, widgetName } =
|
|
widgetProperties as JSONFormWidgetProps;
|
|
const schema: Schema = propertyValue;
|
|
const existingKeys = getKeysFromSchema(schema, ["identifier", "accessor"]);
|
|
const schemaItems = Object.values(schema);
|
|
const lastSchemaItem = maxBy(schemaItems, ({ position }) => position);
|
|
const lastSchemaItemPosition = lastSchemaItem?.position || -1;
|
|
const nextFieldKey = getNextEntityName(DEFAULT_FIELD_NAME, existingKeys);
|
|
const schemaItem = SchemaParser.getSchemaItemFor(nextFieldKey, {
|
|
currSourceData: "",
|
|
widgetName,
|
|
isCustomField: true,
|
|
skipDefaultValueProcessing: true,
|
|
baseSchemaPath: null,
|
|
removedSchemaItems: [],
|
|
modifiedSchemaItems: {},
|
|
identifier: nextFieldKey,
|
|
fieldThemeStylesheets: childStylesheet,
|
|
});
|
|
|
|
schemaItem.position = lastSchemaItemPosition + 1;
|
|
|
|
const path = `${propertyName}.${nextFieldKey}`;
|
|
|
|
if (isEmpty(widgetProperties.schema)) {
|
|
const newSchema = {
|
|
schema: SchemaParser.parse(widgetProperties.widgetName, {}),
|
|
};
|
|
set(newSchema, path, schemaItem);
|
|
|
|
this.updateProperty("schema", newSchema.schema);
|
|
} else {
|
|
/**
|
|
* TODO(Ashit): Not suppose to update the whole schema but just
|
|
* the path within the schema. This is just a hack to make sure
|
|
* the new added paths gets into the dynamicBindingPathList until
|
|
* the updateProperty function is fixed.
|
|
*/
|
|
const updatedSchema = {
|
|
schema: klona(widgetProperties.schema),
|
|
};
|
|
set(updatedSchema, path, schemaItem);
|
|
|
|
this.updateProperty("schema", updatedSchema.schema);
|
|
}
|
|
};
|
|
|
|
onInputChange = (event: React.ChangeEvent<HTMLTextAreaElement> | string) => {
|
|
const value = isString(event) ? event : event.target.value;
|
|
|
|
try {
|
|
const parsedValue = JSON.parse(value);
|
|
this.updateProperty(this.props.propertyName, parsedValue);
|
|
} catch (e) {
|
|
log.error(e);
|
|
}
|
|
};
|
|
|
|
updateItems = (items: DroppableItem[]) => {
|
|
const { propertyName, propertyValue } = this.props;
|
|
const clonedSchema: Schema = klona(propertyValue);
|
|
|
|
items.forEach((item, index) => {
|
|
clonedSchema[item.id].position = index;
|
|
});
|
|
|
|
this.updateProperty(propertyName, clonedSchema);
|
|
};
|
|
|
|
updateFocus = (index: number, isFocused: boolean) => {
|
|
this.setState({ focusedIndex: isFocused ? index : null });
|
|
};
|
|
|
|
render() {
|
|
const { propertyValue = {}, panelConfig } = this.props;
|
|
const schema: Schema = propertyValue;
|
|
const schemaItems = Object.values(schema);
|
|
|
|
const addNewFieldButton = (
|
|
<Button
|
|
className="self-end t--add-column-btn"
|
|
kind="tertiary"
|
|
onClick={this.addNewField}
|
|
size="sm"
|
|
startIcon="plus"
|
|
>
|
|
Add new field
|
|
</Button>
|
|
);
|
|
|
|
if (isEmpty(schema)) {
|
|
return (
|
|
<>
|
|
<EmptyDataState />
|
|
{addNewFieldButton}
|
|
</>
|
|
);
|
|
}
|
|
|
|
const sortedSchemaItems = sortBy(schemaItems, ({ position }) => position);
|
|
|
|
const isMaxLevelReached = !panelConfig;
|
|
|
|
const draggableComponentColumns: DroppableItem[] = sortedSchemaItems.map(
|
|
({ identifier, isCustomField, isVisible, label }, index) => ({
|
|
id: identifier,
|
|
index,
|
|
isCustomField,
|
|
isVisible,
|
|
label,
|
|
}),
|
|
);
|
|
|
|
if (isMaxLevelReached) {
|
|
const {
|
|
additionalAutoComplete,
|
|
dataTreePath,
|
|
expected,
|
|
hideEvaluatedValue,
|
|
label,
|
|
theme,
|
|
} = this.props;
|
|
const value = JSON.stringify(schema, null, 2);
|
|
|
|
return (
|
|
<InputText
|
|
additionalAutocomplete={additionalAutoComplete}
|
|
dataTreePath={dataTreePath}
|
|
expected={expected}
|
|
hideEvaluatedValue={hideEvaluatedValue}
|
|
label={label}
|
|
onChange={this.onInputChange}
|
|
placeholder="{ name: 'John', dataType: 'string' }"
|
|
theme={theme}
|
|
value={value || "{}"}
|
|
/>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<div className="flex flex-col w-full gap-1">
|
|
<DraggableListControl
|
|
deleteOption={this.onDeleteOption}
|
|
focusedIndex={this.state.focusedIndex}
|
|
itemHeight={45}
|
|
items={draggableComponentColumns}
|
|
onEdit={this.onEdit}
|
|
propertyPath={this.props.dataTreePath}
|
|
renderComponent={(props: any) => {
|
|
const { id, isCustomField } = props.item;
|
|
|
|
return DraggableListCard({
|
|
...props,
|
|
toggleVisibility:
|
|
id !== ARRAY_ITEM_KEY ? props.toggleVisibility : undefined,
|
|
isDelete: isCustomField && id !== ARRAY_ITEM_KEY,
|
|
placeholder: "Field label",
|
|
});
|
|
}}
|
|
toggleVisibility={this.toggleVisibility}
|
|
updateFocus={this.updateFocus}
|
|
updateItems={this.updateItems}
|
|
updateOption={this.updateOption}
|
|
/>
|
|
{!this.isArrayItem() && addNewFieldButton}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
static getControlType() {
|
|
return "FIELD_CONFIGURATION";
|
|
}
|
|
}
|
|
|
|
export default FieldConfigurationControl;
|