* fix style bugs * fix select styles * test: fix font size issue for cypress tests * incorporate ashit feedback * test: addresed review comments for cypress tests * add analytics events * height issue in view mode * incorporate code review feedbacks * incorporate code review feedbacks * refactor: addressed review comments; removed border radius and box shadow for text widget; Updated migrations * feat: Makes shadow and radius controls keyboard accessible (#11547) * makes shadow and radius controls keyboard accessible * removes unused imports * moves options out of render method * fix: changed the misnomer background property name to the relevant property name * fix: border radius issue for the map widget * address qa bugs * address qa bugs * fix ux of theming pane when widget is selected * fix: * added backgroundColor to the video widget * restricted pop-over border radius to 0.375rem * added box shadow for the input group for select widget * fix: added delete icon in the delete theme modal * address qa bugs * change checkbox column size in config * add js convertible to button color * remove unused imports * test: fixed jest tests * fix primary color typo * fix: migrations for the theming * fix: * Removed background color from MultiTreeSelect and TreeSelect component. * grouped button's menu button pop over border radius restricting to 0.375rem. * test: updated Dsl migration UT * address qa bugs * address qa bugs * fix: address qa comments * address qa bugs * fix: * migration issue; * unit test cases; * fix rating widget scroll issue * fix youtube video border radius bug * fix select widget * fix select widgets styles * address qa bugs * merge conflicts * makes the reset button keyboard accessible (#12134) * -resolved merge conflicts * address qa bugs * fix: labelTextSize migration fixes * refactor: * made changes to the fontSizeUtils function * fixed the issue related to unit tests * fix button group widget * remove unused imports * fix: fixed the text size migration for the table widget * refactor: addressed review comments for the table widget theming migration * fix button group widget * add init calls for view mode * json form init theme changes * fix: added migration for boxShadow, borderRadius and textSizes for table widget * fix broken fields * test: fixed unit tests * wip * inconsistancy fixes and schemaItem update in updateHook/fieldConfiguration * feat: init json form migration theming * json form primaryColor -> accentColor * update table widget * update table widget * object field label styling * fix: migration related to the JSON form * fix: fixed labelTextSize migration for JSON form nested widgets * property control nested stylesheet lookup * JSONForm label styles form array items * show label for checkbox field array item * fix button group widget * wip * refactor: addressed table widget review comments * refactor: addressed ashit review comments; * added childStylesheet for widgets * feat: Keyboard navigable Color Picker control (#11797) * Makes ColorPicker keyboard accessible * seperate out keyboard and mouse interactions * fix issue with not focusing back to input * Adds test for Color picker * chore: added comment for the boxShadow property * fix: * added unit test cases for the widget and property utils * resolved warning messages * wip * theme config update * fix merge conflicts * refactor: moved theming migration inside the migrations folder * fix qa bugs * fix jest test * fix: unit test cases * fix table column creation logic * refactor: addressed review comments for migrations * fix: Overriding margin and padding for custom render in the dropdown component (#12875) * * fix for custom render padding and margin in ADS dropdown * * fix for removing padding from normal render options * refactor: moved the boxShadow condition to the variable * fix qa bugs * fix: migration QA callouts for audio recorder widget * refactor: added updated comments for boxShadow migration for table widget * fix theme binfings for JSONForm fields under Object * fix table widget theming bug * fix: addressed code review comments * fix: unit test cases * fix: qa migration callouts * fix table widget theming bug * fix JSONForm currency input dropdown not submit form * Added new tests - AppThemingSpec * fix qa bugs * fix unit test * fix JSONForm cellBorderWidth to have default value post migration * fix unit test * fix qa bugs * remove unused imports * fix qa bugs * fix JSONForm input height issue * fix qa bugs * Updating Theming spec * * dropdown color fixes (#13249) * fix caching issue ; * Fixed Theming tests * fix tests * fix tab widget tests * fix: json form children level migration issue * fix table widget tests * Updated test * updated tests * updated test * updated tests * updated tests * updated pageload * fix cypress tests * remove cypress created files * fix color picker issues * Failure fixes * Fixed some more tests * fix: cypress test failures * fix tests * remove consoles * fix table tests * fix qa bugs * updating snapshots for AppPageLayout_spec as per new UI * fix rating widget bug * fix qa bugs * fix: * cypress failing tests * Migration QA callouts * Removed unused imports * update constract check algo * fix color contrast issue * fix: cypress failure test cases * update font sizes labels * fix regression bugs * fix: * JSON form labelTextSize issue fix * Updated comment for the fontSizeUtility function * migrations issues related to table widget borderRadius and boxShadow * fix: default labelTextSize issue for the Input and Select families * fix regression bugs * fix regression bugs * PassingParams spec - added wait time * fix: font family default value issue on JS toggle * fix js toggle issue in text widget * fix tests * fix tests * fix tests * fix cypress tests * fix regression bugs * fix regression bugs * fix: * refactored table widget migration function as per review comments, * added default value to the widget * fix: failing unit test cases * fix theming spec * fix cypress tests * test: fixed failed cypress test * incorporate ashit feedback * fix cypress tests * fix: addressed review comments * comment out table cypress test * fix merge conflicts * comment out color picker tests Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local> Co-authored-by: keyurparalkar <keyur@appsmith.com> Co-authored-by: Aswath K <aswath@appsmith.com> Co-authored-by: Nayan <nayan@appsmith.com> Co-authored-by: Ashit Rath <ashit@appsmith.com> Co-authored-by: balajisoundar <balaji@appsmith.com> Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: apple <nandan@thinkify.io> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
297 lines
8.1 KiB
TypeScript
297 lines
8.1 KiB
TypeScript
import React from "react";
|
|
import log from "loglevel";
|
|
import { klona } from "klona";
|
|
import { isEmpty, isString, maxBy, set, sortBy } from "lodash";
|
|
|
|
import BaseControl, { ControlProps } from "./BaseControl";
|
|
import EmptyDataState from "components/utils/EmptyDataState";
|
|
import SchemaParser, {
|
|
getKeysFromSchema,
|
|
} from "widgets/JSONFormWidget/schemaParser";
|
|
import styled from "constants/DefaultTheme";
|
|
import { ARRAY_ITEM_KEY, Schema } from "widgets/JSONFormWidget/constants";
|
|
import { Category, Size } from "components/ads/Button";
|
|
import {
|
|
BaseItemProps,
|
|
DroppableComponent,
|
|
} from "components/ads/DraggableListComponent";
|
|
import { DraggableListCard } from "components/ads/DraggableListCard";
|
|
import { StyledPropertyPaneButton } from "./StyledControls";
|
|
import { getNextEntityName } from "utils/AppsmithUtils";
|
|
import { InputText } from "./InputTextControl";
|
|
import { JSONFormWidgetProps } from "widgets/JSONFormWidget/widget";
|
|
|
|
type DroppableItem = BaseItemProps & {
|
|
index: number;
|
|
isCustomField: boolean;
|
|
};
|
|
|
|
type State = {
|
|
focusedIndex: number | null;
|
|
};
|
|
|
|
const TabsWrapper = styled.div`
|
|
width: 100%;
|
|
display: flex;
|
|
flex-direction: column;
|
|
`;
|
|
|
|
const AddFieldButton = styled(StyledPropertyPaneButton)`
|
|
width: 100%;
|
|
display: flex;
|
|
justify-content: center;
|
|
&&&& {
|
|
margin-top: 12px;
|
|
margin-bottom: 8px;
|
|
}
|
|
`;
|
|
|
|
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,
|
|
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 = (
|
|
<AddFieldButton
|
|
category={Category.tertiary}
|
|
className="t--add-column-btn"
|
|
icon="plus"
|
|
onClick={this.addNewField}
|
|
size={Size.medium}
|
|
tag="button"
|
|
text="Add a new field"
|
|
type="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 (
|
|
<TabsWrapper>
|
|
<DroppableComponent
|
|
deleteOption={this.onDeleteOption}
|
|
focusedIndex={this.state.focusedIndex}
|
|
itemHeight={45}
|
|
items={draggableComponentColumns}
|
|
onEdit={this.onEdit}
|
|
renderComponent={(props) => {
|
|
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}
|
|
</TabsWrapper>
|
|
);
|
|
}
|
|
|
|
static getControlType() {
|
|
return "FIELD_CONFIGURATION";
|
|
}
|
|
}
|
|
|
|
export default FieldConfigurationControl;
|