Date: Fri, 16 Apr 2021 15:59:31 -0700
Subject: [PATCH 11/15] Update expandableNode.test.tsx
---
.../client/__tests__/components/expandableNode.test.tsx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Composer/packages/client/__tests__/components/expandableNode.test.tsx b/Composer/packages/client/__tests__/components/expandableNode.test.tsx
index 1fa7739519..6d9388b42d 100644
--- a/Composer/packages/client/__tests__/components/expandableNode.test.tsx
+++ b/Composer/packages/client/__tests__/components/expandableNode.test.tsx
@@ -14,16 +14,17 @@ describe('', () => {
it('closes and opens on click', async () => {
if (component == null) fail();
+
const triangle = await component.findByTestId('summaryTag');
let details = await component.findByTestId('dialog');
- expect(details.attributes.getNamedItem('open')).not.toBeNull();
+ expect(details.childNodes.length).toBe(2); // 1 for the summary itself, 1 for the details
fireEvent.click(triangle);
details = await component.findByTestId('dialog');
- expect(details.attributes.getNamedItem('open')).toBeNull();
+ expect(details.childNodes.length).toBe(1); // when the node is closed, the details don't render at all
fireEvent.click(triangle);
details = await component.findByTestId('dialog');
- expect(details.attributes.getNamedItem('open')).not.toBeNull();
+ expect(details.childNodes.length).toBe(2);
});
});
From 04f194f94074ada3a01e4a47f1aa12d36e4ab59a Mon Sep 17 00:00:00 2001
From: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Date: Mon, 19 Apr 2021 12:17:28 -0700
Subject: [PATCH 12/15] add new timeout to tests
---
Composer/cypress/integration/Breadcrumb.spec.ts | 4 ++--
Composer/packages/server/src/locales/en-US.json | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Composer/cypress/integration/Breadcrumb.spec.ts b/Composer/cypress/integration/Breadcrumb.spec.ts
index 9f7d373374..6258aea5d3 100644
--- a/Composer/cypress/integration/Breadcrumb.spec.ts
+++ b/Composer/cypress/integration/Breadcrumb.spec.ts
@@ -13,7 +13,7 @@ context('breadcrumb', () => {
});
function hasBreadcrumbItems(cy: Cypress.cy, items: (string | RegExp)[]) {
- cy.get('[data-testid="Breadcrumb"]')
+ cy.get('[data-testid="Breadcrumb"]', { timeout: 10000 })
.last()
.get('li')
.should(($li) => {
@@ -35,7 +35,7 @@ context('breadcrumb', () => {
hasBreadcrumbItems(cy, ['__TestTodoSample']);
});
- it('can show dialog and trigger name in breadcrumb', () => {
+ it.only('can show dialog and trigger name in breadcrumb', () => {
cy.findByTestId('ProjectTree').within(() => {
cy.findByTestId('addtodo_Dialog started').click();
});
diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json
index 18725294d3..945d7b9cfd 100644
--- a/Composer/packages/server/src/locales/en-US.json
+++ b/Composer/packages/server/src/locales/en-US.json
@@ -1262,6 +1262,9 @@
"edit_in_json_75d0d754": {
"message": "Edit in JSON"
},
+ "edit_in_power_virtual_agents_56ee7ac2": {
+ "message": "Edit in Power Virtual Agents"
+ },
"edit_kb_name_5e2d8c5b": {
"message": "Edit KB name"
},
@@ -2594,9 +2597,6 @@
"open_e0beb7b9": {
"message": "Open"
},
- "open_in_power_virtual_agents_fcd881e6": {
- "message": "Open in Power Virtual Agents"
- },
"open_inline_editor_a5aabcfa": {
"message": "Open inline editor"
},
From 1a64edc59c2baf6f30a74e6ce0061275f33cddc1 Mon Sep 17 00:00:00 2001
From: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Date: Mon, 19 Apr 2021 12:17:36 -0700
Subject: [PATCH 13/15] Update Breadcrumb.spec.ts
---
Composer/cypress/integration/Breadcrumb.spec.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Composer/cypress/integration/Breadcrumb.spec.ts b/Composer/cypress/integration/Breadcrumb.spec.ts
index 6258aea5d3..aa9a6cdf74 100644
--- a/Composer/cypress/integration/Breadcrumb.spec.ts
+++ b/Composer/cypress/integration/Breadcrumb.spec.ts
@@ -35,7 +35,7 @@ context('breadcrumb', () => {
hasBreadcrumbItems(cy, ['__TestTodoSample']);
});
- it.only('can show dialog and trigger name in breadcrumb', () => {
+ it('can show dialog and trigger name in breadcrumb', () => {
cy.findByTestId('ProjectTree').within(() => {
cy.findByTestId('addtodo_Dialog started').click();
});
From b849dec4e87f18d95c00ab9ef6b7f2db9b3173d2 Mon Sep 17 00:00:00 2001
From: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Date: Mon, 19 Apr 2021 13:49:54 -0700
Subject: [PATCH 14/15] post-merge fixes
---
.../client/src/components/ProjectTree/TopicsList.tsx | 6 ++++--
.../packages/client/src/components/ProjectTree/treeItem.tsx | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Composer/packages/client/src/components/ProjectTree/TopicsList.tsx b/Composer/packages/client/src/components/ProjectTree/TopicsList.tsx
index c2c4b26236..f050de5634 100644
--- a/Composer/packages/client/src/components/ProjectTree/TopicsList.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/TopicsList.tsx
@@ -10,7 +10,7 @@ import get from 'lodash/get';
import { ExpandableNode } from './ExpandableNode';
import { TreeItem } from './treeItem';
-import { LEVEL_PADDING, INDENT_PER_LEVEL } from './constants';
+import { INDENT_PER_LEVEL } from './constants';
import { headerCSS } from './ProjectTree';
type TopicsListProps = {
@@ -69,8 +69,10 @@ export const TopicsList: React.FC = ({ topics, onToggle, textWi
link={{
displayName: formatMessage('Power Virtual Agents Topics ({count})', { count: topics.length }),
projectId,
+ isRoot: false,
+ isRemote: false,
+ diagnostics: [],
}}
- padLeft={0 * LEVEL_PADDING}
showErrors={false}
textWidth={textWidth}
/>
diff --git a/Composer/packages/client/src/components/ProjectTree/treeItem.tsx b/Composer/packages/client/src/components/ProjectTree/treeItem.tsx
index 715bf7bdc6..d4a575a8c2 100644
--- a/Composer/packages/client/src/components/ProjectTree/treeItem.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/treeItem.tsx
@@ -285,6 +285,8 @@ type ITreeItemProps = {
isMenuOpen?: boolean;
showErrors?: boolean;
role?: string;
+ href?: string;
+ tooltip?: string;
};
const renderTreeMenuItem = (link: TreeLink) => (item: TreeMenuItem) => {
@@ -417,7 +419,6 @@ export const TreeItem: React.FC = ({
onSelect,
textWidth = 100,
menu = [],
- extraSpace = 0,
menuOpenCallback = () => {},
isMenuOpen = false,
showErrors = true,
From 479a23ff0382457a4d97be38ef8cd481ff3040fb Mon Sep 17 00:00:00 2001
From: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Date: Mon, 19 Apr 2021 15:06:50 -0700
Subject: [PATCH 15/15] scope breadcrumb tests to inside breadcrumb
---
Composer/cypress/integration/Breadcrumb.spec.ts | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Composer/cypress/integration/Breadcrumb.spec.ts b/Composer/cypress/integration/Breadcrumb.spec.ts
index aa9a6cdf74..a50f8967bd 100644
--- a/Composer/cypress/integration/Breadcrumb.spec.ts
+++ b/Composer/cypress/integration/Breadcrumb.spec.ts
@@ -13,12 +13,13 @@ context('breadcrumb', () => {
});
function hasBreadcrumbItems(cy: Cypress.cy, items: (string | RegExp)[]) {
- cy.get('[data-testid="Breadcrumb"]', { timeout: 10000 })
+ cy.get('[data-testid="Breadcrumb"]')
.last()
- .get('li')
- .should(($li) => {
- items.forEach((item, idx) => {
- expect($li.eq(idx)).to.contain(item);
+ .within(() => {
+ cy.get('li').should(($li) => {
+ items.forEach((item, idx) => {
+ expect($li.eq(idx)).to.contain(item);
+ });
});
});
}