Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 39 additions & 37 deletions Composer/packages/client/src/pages/design/SideBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,28 +103,32 @@ const SideBar: React.FC<SideBarProps> = React.memo(({ projectId }) => {
const setBrokenSkillInfo = useSetRecoilState(brokenSkillInfoState);
const setAddSkillDialogModalVisibility = useSetRecoilState(showAddSkillDialogModalState);

function handleSelect(link: TreeLink) {
if (link.botError) {
setBrokenSkillInfo(link);
function handleSelect(destination: TreeLink) {
if (destination.botError) {
setBrokenSkillInfo(destination);
}
const { skillId, dialogId, trigger } = link;
const {
skillId: targetSkillId,
dialogId: targetDialogId,
trigger: targetTrigger,
projectId: targetProjectId,
} = destination;

updateZoomRate({ currentRate: 1 });

if (trigger != null) {
selectTo(skillId ?? null, dialogId ?? null, `triggers[${trigger}]`);
} else if (dialogId != null) {
navTo(skillId ?? projectId, dialogId);
if (targetTrigger != null) {
selectTo(targetSkillId ?? null, targetDialogId ?? null, `triggers[${targetTrigger}]`);
} else if (targetDialogId != null) {
navTo(targetSkillId ?? targetProjectId, targetDialogId);
} else {
// with no dialog or ID, we must be looking at a bot link
navTo(skillId ?? projectId, null);
navTo(targetSkillId ?? targetProjectId, null);
}
}

const onCreateDialogComplete = (projectId: string) => (dialogId: string) => {
const target = projectId;
if (dialogId) {
navTo(target, dialogId);
const onCreateDialogComplete = (targetProjectId: string) => (targetDialogId: string) => {
if (targetDialogId) {
navTo(targetProjectId, targetDialogId);
}
};

Expand Down Expand Up @@ -262,30 +266,28 @@ const SideBar: React.FC<SideBarProps> = React.memo(({ projectId }) => {
const selectedTrigger = currentDialog?.triggers.find((t) => t.id === selected);

return (
<React.Fragment>
<ProjectTree
headerMenu={projectTreeHeaderMenuItems}
selectedLink={{
projectId: rootProjectId,
skillId: rootProjectId === projectId ? undefined : projectId,
dialogId,
trigger: parseTriggerId(selectedTrigger?.id),
}}
onBotCreateDialog={handleCreateDialog}
onBotDeleteDialog={handleDeleteDialog}
onBotEditManifest={handleDisplayManifestModal}
onBotExportZip={exportToZip}
onBotRemoveSkill={handleRemoveSkill}
onBotStart={startSingleBot}
onBotStop={stopSingleBot}
onDialogCreateTrigger={(projectId, dialogId) => {
setTriggerModalInfo({ projectId, dialogId });
}}
onDialogDeleteTrigger={handleDeleteTrigger}
onErrorClick={handleErrorClick}
onSelect={handleSelect}
/>
</React.Fragment>
<ProjectTree
headerMenu={projectTreeHeaderMenuItems}
selectedLink={{
projectId: rootProjectId,
skillId: rootProjectId === projectId ? undefined : projectId,
dialogId,
trigger: parseTriggerId(selectedTrigger?.id),
}}
onBotCreateDialog={handleCreateDialog}
onBotDeleteDialog={handleDeleteDialog}
onBotEditManifest={handleDisplayManifestModal}
onBotExportZip={exportToZip}
onBotRemoveSkill={handleRemoveSkill}
onBotStart={startSingleBot}
onBotStop={stopSingleBot}
onDialogCreateTrigger={(projectId, dialogId) => {
setTriggerModalInfo({ projectId, dialogId });
}}
onDialogDeleteTrigger={handleDeleteTrigger}
onErrorClick={handleErrorClick}
onSelect={handleSelect}
/>
);
});

Expand Down