Skip to content
Open
Show file tree
Hide file tree
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
17 changes: 13 additions & 4 deletions apps/aevatar-console-web/src/app.navigation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ describe("app navigation groups", () => {
jest.resetModules();
});

it("places Chat as a top-level navigation group below Teams", () => {
it("places Chat as a top-level navigation item below Teams", () => {
const groups = loadNavigationGroups();
const chatGroup = groups.find((group) => group.key === "chat");

expect(groups.map((group) => group.label)).toEqual([
"Teams",
Expand All @@ -36,8 +37,8 @@ describe("app navigation groups", () => {
"nav.groups.platform",
"nav.groups.settings",
]);
expect(groups.find((group) => group.key === "chat")?.flattenSingleItem).toBe(true);
expect(groups.find((group) => group.key === "chat")?.flattenSingleItemAsGroupLabel).toBe(true);
expect(chatGroup?.flattenSingleItem).toBe(true);
expect(chatGroup?.icon).toBeTruthy();
expect(groups.find((group) => group.key === "teams")?.flattenSingleItem).toBeUndefined();
});

Expand Down Expand Up @@ -73,7 +74,7 @@ describe("app navigation groups", () => {
},
],
groups,
(group) => group.label,
(group) => `Group:${group.label}`,
);

expect(menuItems.map((item) => item.path ?? item.key)).toEqual([
Expand All @@ -85,5 +86,13 @@ describe("app navigation groups", () => {
expect(menuItems[0].children?.map((child) => child.path)).toEqual([
"/scopes",
]);
expect(menuItems[0].name).toBe("Group:Teams");
expect(menuItems[1]).toMatchObject({
menuGroupKey: "chat",
name: "Chat",
path: "/chat",
});
expect(menuItems[1].icon).toBeTruthy();
expect(menuItems[2].name).toBe("Group:Platform");
});
});
56 changes: 0 additions & 56 deletions apps/aevatar-console-web/src/global.less
Original file line number Diff line number Diff line change
Expand Up @@ -153,62 +153,6 @@ body,
margin: 0;
}

.ant-pro-sider
.ant-menu-inline:not(.ant-menu-inline-collapsed)
.ant-menu-item[data-menu-id$="/chat"] {
position: relative;
width: calc(100% - 20px);
height: 34px;
margin: 10px 10px 12px !important;
padding: 0 0 12px !important;
line-height: 22px;
border-bottom: 1px solid rgba(148, 163, 184, 0.28);
border-radius: 0;
}

.ant-pro-sider
.ant-menu-inline:not(.ant-menu-inline-collapsed)
.ant-menu-item[data-menu-id$="/chat"]::after {
display: none;
}

.ant-pro-sider
.ant-menu-inline:not(.ant-menu-inline-collapsed)
.ant-menu-item[data-menu-id$="/chat"]:hover,
.ant-pro-sider
.ant-menu-inline:not(.ant-menu-inline-collapsed)
.ant-menu-item[data-menu-id$="/chat"].ant-menu-item-selected {
background: transparent !important;
}

.ant-pro-sider
.ant-menu-inline:not(.ant-menu-inline-collapsed)
.ant-menu-item[data-menu-id$="/chat"]
.ant-pro-base-menu-inline-item-text {
color: #667085;
font-weight: 700;
}

.ant-pro-sider
.ant-menu-inline:not(.ant-menu-inline-collapsed)
.ant-menu-item[data-menu-id$="/chat"].ant-menu-item-selected
.ant-pro-base-menu-inline-item-text {
color: #344054;
}

.ant-pro-sider
.ant-menu-inline:not(.ant-menu-inline-collapsed)
.ant-menu-item[data-menu-id$="/chat"].ant-menu-item-selected::before {
position: absolute;
top: 2px;
bottom: 14px;
left: -8px;
width: 3px;
background: #1677ff;
border-radius: 999px;
content: "";
}

.ant-pro-sider .ant-menu-inline .ant-menu-item-divider,
.ant-pro-sider .ant-menu-inline .ant-pro-base-menu-inline-divider {
margin: 10px 10px 12px !important;
Expand Down
2 changes: 1 addition & 1 deletion apps/aevatar-console-web/src/locales/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1162,7 +1162,7 @@ const enUSMessages = {
'teamMemberWorkflowStudio.header.publish.publishingStatus': 'Publishing',
'teamMemberWorkflowStudio.header.publishMember': 'Publish member workflow',
'teamMemberWorkflowStudio.header.publishMemberShort': 'Publish member',
'teamMemberWorkflowStudio.header.teamBreadcrumb': 'Team',
'teamMemberWorkflowStudio.header.teamBreadcrumb': 'Teams',
'teamMemberWorkflowStudio.header.unsavedChanges': 'Unsaved changes',
'teamMemberWorkflowStudio.header.viewsAria': 'Workflow views',
'teamMemberWorkflowStudio.header.workflowTitleAria': 'Workflow title',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type WorkflowStudioCanvasProps = {
readonly onNodeSelect?: (nodeId: string) => void;
readonly selectedEdgeId?: string;
readonly selectedNodeId?: string;
readonly viewportRightInset?: number;
};

const WorkflowStudioCanvas: React.FC<WorkflowStudioCanvasProps> = ({
Expand All @@ -37,6 +38,7 @@ const WorkflowStudioCanvas: React.FC<WorkflowStudioCanvasProps> = ({
onNodeSelect,
selectedEdgeId,
selectedNodeId,
viewportRightInset,
}) => (
<div
data-testid="workflow-studio-canvas"
Expand Down Expand Up @@ -74,6 +76,7 @@ const WorkflowStudioCanvas: React.FC<WorkflowStudioCanvasProps> = ({
selectedEdgeId={selectedEdgeId}
selectedNodeId={selectedNodeId}
variant="studio"
viewportRightInset={viewportRightInset}
/>
</div>
);
Expand Down
Loading
Loading