## 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>
186 lines
5.1 KiB
TypeScript
186 lines
5.1 KiB
TypeScript
import React from "react";
|
|
import type { ControlProps } from "./BaseControl";
|
|
import BaseControl from "./BaseControl";
|
|
import { generateReactKey } from "utils/generators";
|
|
import { getNextEntityName } from "utils/AppsmithUtils";
|
|
import orderBy from "lodash/orderBy";
|
|
import isString from "lodash/isString";
|
|
import isUndefined from "lodash/isUndefined";
|
|
import { DraggableListControl } from "pages/Editor/PropertyPane/DraggableListControl";
|
|
import { DraggableListCard } from "components/propertyControls/DraggableListCard";
|
|
import { Button } from "design-system";
|
|
|
|
type State = {
|
|
focusedIndex: number | null;
|
|
};
|
|
|
|
class MenuItemsControl extends BaseControl<ControlProps, State> {
|
|
constructor(props: ControlProps) {
|
|
super(props);
|
|
|
|
this.state = {
|
|
focusedIndex: null,
|
|
};
|
|
}
|
|
|
|
componentDidUpdate(prevProps: ControlProps): void {
|
|
//on adding a new column last column should get focused
|
|
if (
|
|
prevProps.propertyValue &&
|
|
this.props.propertyValue &&
|
|
Object.keys(prevProps.propertyValue).length + 1 ===
|
|
Object.keys(this.props.propertyValue).length
|
|
) {
|
|
this.updateFocus(Object.keys(this.props.propertyValue).length - 1, true);
|
|
}
|
|
}
|
|
updateItems = (items: Array<Record<string, any>>) => {
|
|
const menuItems = items.reduce((obj: any, each: any, index) => {
|
|
obj[each.id] = {
|
|
...each,
|
|
index,
|
|
};
|
|
return obj;
|
|
}, {});
|
|
this.updateProperty(this.props.propertyName, menuItems);
|
|
};
|
|
|
|
getMenuItems = () => {
|
|
const menuItems: Array<{
|
|
id: string;
|
|
label: string;
|
|
isDisabled: boolean;
|
|
isVisible: boolean;
|
|
widgetId: string;
|
|
}> =
|
|
isString(this.props.propertyValue) ||
|
|
isUndefined(this.props.propertyValue)
|
|
? []
|
|
: Object.values(this.props.propertyValue);
|
|
|
|
return orderBy(menuItems, ["index"], ["asc"]);
|
|
};
|
|
|
|
onEdit = (index: number) => {
|
|
const menuItems = this.getMenuItems();
|
|
const targetMenuItem = menuItems[index];
|
|
this.props.openNextPanel({
|
|
index,
|
|
...targetMenuItem,
|
|
propPaneId: this.props.widgetProperties.widgetId,
|
|
});
|
|
};
|
|
|
|
render() {
|
|
return (
|
|
<div className="flex flex-col gap-1">
|
|
<DraggableListControl
|
|
deleteOption={this.deleteOption}
|
|
fixedHeight={370}
|
|
focusedIndex={this.state.focusedIndex}
|
|
itemHeight={45}
|
|
items={this.getMenuItems()}
|
|
onEdit={this.onEdit}
|
|
propertyPath={this.props.dataTreePath}
|
|
renderComponent={(props: any) =>
|
|
DraggableListCard({
|
|
...props,
|
|
isDelete: true,
|
|
placeholder: "Menu item label",
|
|
})
|
|
}
|
|
toggleVisibility={this.toggleVisibility}
|
|
updateFocus={this.updateFocus}
|
|
updateItems={this.updateItems}
|
|
updateOption={this.updateOption}
|
|
/>
|
|
|
|
<Button
|
|
className="self-end t--add-menu-item-btn"
|
|
kind="tertiary"
|
|
onClick={this.addOption}
|
|
startIcon="plus"
|
|
>
|
|
Add new menu item
|
|
</Button>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
toggleVisibility = (index: number) => {
|
|
const menuItems = this.getMenuItems();
|
|
const isVisible = menuItems[index].isVisible === true ? false : true;
|
|
const updatedMenuItems = menuItems.map((item, itemIndex) => {
|
|
if (index === itemIndex) {
|
|
return {
|
|
...item,
|
|
isVisible: isVisible,
|
|
};
|
|
}
|
|
return item;
|
|
});
|
|
this.updateProperty(this.props.propertyName, updatedMenuItems);
|
|
};
|
|
|
|
deleteOption = (index: number) => {
|
|
const menuItemsArray = this.getMenuItems();
|
|
if (menuItemsArray.length === 1) return;
|
|
const updatedArray = menuItemsArray.filter((eachItem: any, i: number) => {
|
|
return i !== index;
|
|
});
|
|
const updatedObj = updatedArray.reduce(
|
|
(obj: any, each: any, index: number) => {
|
|
obj[each.id] = {
|
|
...each,
|
|
index,
|
|
};
|
|
return obj;
|
|
},
|
|
{},
|
|
);
|
|
this.updateProperty(this.props.propertyName, updatedObj);
|
|
};
|
|
|
|
updateOption = (index: number, updatedLabel: string) => {
|
|
const menuItemsArray = this.getMenuItems();
|
|
const itemId = menuItemsArray[index].id;
|
|
this.updateProperty(
|
|
`${this.props.propertyName}.${itemId}.label`,
|
|
updatedLabel,
|
|
);
|
|
};
|
|
|
|
addOption = () => {
|
|
let menuItems = this.props.propertyValue || [];
|
|
const menuItemsArray = this.getMenuItems();
|
|
const newMenuItemId = generateReactKey({ prefix: "menuItem" });
|
|
const newMenuItemLabel = getNextEntityName(
|
|
"Menu Item ",
|
|
menuItemsArray.map((menuItem: any) => menuItem.label),
|
|
);
|
|
menuItems = {
|
|
...menuItems,
|
|
[newMenuItemId]: {
|
|
id: newMenuItemId,
|
|
index: menuItemsArray.length,
|
|
label: newMenuItemLabel,
|
|
widgetId: generateReactKey(),
|
|
isDisabled: false,
|
|
isVisible: true,
|
|
},
|
|
};
|
|
|
|
this.updateProperty(this.props.propertyName, menuItems);
|
|
};
|
|
|
|
updateFocus = (index: number, isFocused: boolean) => {
|
|
this.setState({ focusedIndex: isFocused ? index : null });
|
|
};
|
|
|
|
static getControlType() {
|
|
return "MENU_ITEMS";
|
|
}
|
|
}
|
|
|
|
export default MenuItemsControl;
|