Merge branch 'master' into cwhitten/fix-activityprocessed

microsoft · Mar 6, 2020 · 793361c · 793361c
2 parents 0036336 + c17b59e
commit 793361c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/Composer/cypress/integration/LUPage.spec.ts b/Composer/cypress/integration/LUPage.spec.ts
@@ -14,10 +14,7 @@ context('LU Page', () => {
     cy.contains('ToDoBotWithLuisSample.Main');
     cy.contains('All');
 
-    cy.get('.toggleEditMode button').as('switchButton');
-
-    // all multiple file, edit mode button is disabled.
-    cy.get('@switchButton').should('be.disabled');
+    cy.get('.toggleEditMode button').should('not.exist');
 
     // by default is table view
     cy.findByTestId('LUEditor')
@@ -28,7 +25,7 @@ context('LU Page', () => {
     cy.findByTestId('LUEditor').within(() => {
       cy.findByText('__TestToDoBotWithLuisSample.Main').click();
     });
-
+    cy.get('.toggleEditMode button').as('switchButton');
     // goto edit-mode
     cy.get('@switchButton').click();
     cy.findByTestId('LUEditor')

diff --git a/Composer/packages/client/src/pages/language-understanding/index.tsx b/Composer/packages/client/src/pages/language-understanding/index.tsx
@@ -91,16 +91,17 @@ const LUPage: React.FC<LUPageProps> = props => {
       <div css={ContentHeaderStyle}>
         <div css={HeaderText}>{formatMessage('User Input')}</div>
         <div css={flexContent}>
-          <Toggle
-            className={'toggleEditMode'}
-            css={actionButton}
-            onText={formatMessage('Edit mode')}
-            offText={formatMessage('Edit mode')}
-            defaultChecked={false}
-            checked={!!edit}
-            disabled={isRoot && edit === false}
-            onChange={onToggleEditMode}
-          />
+          {(!isRoot || edit) && (
+            <Toggle
+              className={'toggleEditMode'}
+              css={actionButton}
+              onText={formatMessage('Edit mode')}
+              offText={formatMessage('Edit mode')}
+              defaultChecked={false}
+              checked={!!edit}
+              onChange={onToggleEditMode}
+            />
+          )}
         </div>
       </div>
       <div css={ContentStyle} data-testid="LUEditor">

diff --git a/Composer/packages/extensions/visual-designer/src/components/lib/EdgeUtil.tsx b/Composer/packages/extensions/visual-designer/src/components/lib/EdgeUtil.tsx
@@ -126,7 +126,14 @@ export const drawSVGEdge = (
     const [p1, p2] = calculateArrowPoints(endPoint, direction);
     const points = [p1, endPoint, p2].map(p => `${p.x},${p.y}`).join(' ');
     const arrow = (
-      <polyline key={`edge-${id}__arrow`} points={points} {...strokeProps} fill="none" strokeDasharray="none" />
+      <polyline
+        key={`edge-${id}__arrow`}
+        name={id}
+        points={points}
+        {...strokeProps}
+        fill="none"
+        strokeDasharray="none"
+      />
     );
     elements.push(arrow);
   }

diff --git a/Composer/packages/extensions/visual-designer/src/components/menus/NodeMenu.tsx b/Composer/packages/extensions/visual-designer/src/components/menus/NodeMenu.tsx
@@ -19,7 +19,7 @@ const declareElementAttributes = (id: string) => {
     [AttrNames.SelectedId]: `${id}${MenuTypes.NodeMenu}`,
   };
 };
-export const NodeMenu = ({ id, onEvent }): JSX.Element => {
+export const NodeMenu = ({ id, onEvent }) => {
   const menuItems = [
     {
       key: 'delete',
@@ -35,6 +35,7 @@ export const NodeMenu = ({ id, onEvent }): JSX.Element => {
 
   return (
     <div
+      data-name="nodeMenu"
       css={{
         marginRight: '1px',
       }}

diff --git a/Composer/packages/extensions/visual-designer/src/editors/StepEditor.tsx b/Composer/packages/extensions/visual-designer/src/editors/StepEditor.tsx
@@ -83,6 +83,7 @@ export const StepEditor = ({ id, data, onEvent, trigger, addCoachMarkRef }): JSX
           { directed: true }
         )}
         <circle
+          name="editor__end"
           r={TerminatorSize.height / 2 - 1}
           cx={editorAxisX}
           cy={contentBoundary.height + HeadSize.height + ElementInterval.y / 2 + TerminatorSize.height / 2}