Merge branch 'settingsPage' into julong/publish-page

* settingsPage: (110 commits)
  code style
  update qna end point key after update qna subscription key
  handle comments
  handle comments
  chore: remove orchestrator (microsoft#4602)
  feat: taking control recognizer generation enhancements (microsoft#4549)
  chore: Set up Nightly static analysis pipeline in ADO (microsoft#4589)
  feature: show multi-skill project with correct link behavior (microsoft#4466)
  doc: guidelines/help-contents (microsoft#4354)
  Functions runtime: Revert to netcore3.0 for functions and make code more robust to functions variations (microsoft#4570)
  feat: Disable Connect to Skill menu action inside skill (microsoft#4557)
  fix (microsoft#4591)
  fix: Adds validation for form dialogs propery name (microsoft#4574)
  fix: update archive version in extensions/vacore (microsoft#4571)
  fix: e2e test (microsoft#4581)
  perf: avoid redraw when Project Tree selected item not changed (microsoft#4564)
  fix: security analysis failure due to bl package version (microsoft#4580)
  fix publish ut timeout (microsoft#4578)
  fix: Can not add properties in "SetProperties" action (microsoft#4572)
  ci: remove code scanning workflow (microsoft#4569)
  ...

Composer/.dockerignore → .dockerignore

@@ -11,7 +11,15 @@ Dockerfile
 .dockerignore
 
 # ignore local bots
-plugins/localPublish/hostedBots/*
+extensions/localPublish/hostedBots/*
 
 # ignore test
-coverage
+Composer/coverage
+Composer/packages/server/.composer
+
+extensions/.build-cache.json
+extensions/**/lib
+extensions/**/dist
+
+# ignore .git folders
+**/.git

.github/workflows/docker.yml

@@ -0,0 +1,37 @@
+name: Docker Build Validation
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    types: [opened, reopened, synchronize]
+  workflow_dispatch:
+
+jobs:
+  build:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          push: false
+          context: .
+          file: Dockerfile
+          tags: botframework-composer
+
+      - name: Health check
+        run: |
+          containerId=$(docker run -d -p "5000:5000" botframework-composer)
+          sleep 10
+          docker logs $containerId
+          curl -Is http://localhost:5000 | grep -q "200 OK"
+        shell: bash
+
+      - name: Clean up
+        if: always()
+        run: docker rm -f $(docker ps -a -q)

.github/workflows/main.yml

@@ -25,15 +25,17 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 12.13.0
-      - name: Restore yarn cache
-        uses: actions/cache@preview
-        with:
-          path: ~/.cache/yarn
-          key: ${{ runner.os }}-yarn-${{ hashFiles(format('{0}{1}', github.workspace, '/Composer/yarn.lock')) }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: yarn install
-        run: yarn
+      #- name: Restore yarn cache
+      #  uses: actions/cache@v2.1.2
+      #  with:
+      #    path: ~/.cache/yarn
+      #    key: ${{ runner.os }}-yarn-new-${{ hashFiles(format('{0}{1}', github.workspace, '/Composer/yarn.lock')) }}
+      #    restore-keys: |
+      #      ${{ runner.os }}-yarn-new-
+      - name: Clear global yarn cache
+        run: yarn cache clean
+      - name: yarn --update-checksums
+        run: yarn --update-checksums
       - name: yarn build:dev
         run: yarn build:dev
       - name: yarn lint

.vscode/snippets.json.code-snippets

@@ -1,26 +1,26 @@
 {
-	// Place your BotFramework-Composer workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
-	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
-	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
-	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
-	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
-	// Placeholders with the same ids are connected.
-	"React component test scaffolding": {
-		"prefix": "rct",
-		"body": [
-			"import React from 'react';",
-      "import { render } from '@bfc/test-utils';",
+  // Place your BotFramework-Composer workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
+  // description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
+  // is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
+  // used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
+  // $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
+  // Placeholders with the same ids are connected.
+  "React component test scaffolding": {
+    "prefix": "rct",
+    "body": [
+      "import React from 'react';",
+      "import { render } from '@botframework-composer/test-utils';",
       "import assign from 'lodash/assign';\n",
       "import { $1 } from '$2';\n",
       "const defaultProps = {\n  $3\n};\n",
       "function renderSubject(overrides = {}) {",
       "  const props = assign({}, defaultProps, overrides);",
       "  return render(<$1 {...props} />);",
       "}\n",
-			"describe('<$1 />', () => {",
-			"  it.todo('$0');",
-			"});\n"
-		],
-		"description": "React component test scaffolding"
-	}
+      "describe('<$1 />', () => {",
+      "  it.todo('$0');",
+      "});\n"
+    ],
+    "description": "React component test scaffolding"
+  }
 }

Composer/.npmrc

@@ -1,2 +1 @@
-@bfcomposer:registry=https://botbuilder.myget.org/F/botbuilder-declarative/npm/
 scripts-prepend-node-path=true

Composer/cypress/integration/Breadcrumb.spec.ts

@@ -27,12 +27,6 @@ context('breadcrumb', () => {
     // Should path = main dialog at first render
     hasBreadcrumbItems(cy, ['__TestTodoSample']);
 
-    // Click on AddToDo dialog
-    cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('addtodo').click();
-    });
-    hasBreadcrumbItems(cy, ['Addtodo']);
-
     // Return to Main.dialog
     cy.findByTestId('ProjectTree').within(() => {
       cy.findByText('__TestTodoSample').click();
@@ -43,11 +37,10 @@ context('breadcrumb', () => {
 
   it('can show event name in breadcrumb', () => {
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('addtodo').click();
-      cy.findByText('Dialog started').click();
+      cy.findByTestId('addtodo_Dialog started').click();
     });
 
-    hasBreadcrumbItems(cy, ['Addtodo', 'Dialog started']);
+    hasBreadcrumbItems(cy, ['__TestTodoSample', 'Dialog started']);
   });
 
   it('can show action name in breadcrumb', () => {

Composer/cypress/integration/LGPage.spec.ts

@@ -13,7 +13,7 @@ context('LG Page', () => {
     cy.contains('TodoSample');
     cy.contains('All');
 
-    cy.get('.toggleEditMode button').as('switchButton');
+    cy.findByTestId('showcode').as('switchButton');
 
     // by default is table view
     cy.findByTestId('LGPage').findByTestId('table-view').should('exist');

Composer/cypress/integration/LUPage.spec.ts

@@ -13,7 +13,7 @@ context('LU Page', () => {
     cy.contains('__TestToDoBotWithLuisSample');
     cy.contains('All');
 
-    cy.get('.toggleEditMode button').should('not.exist');
+    cy.findByTestId('showcode').should('not.exist');
 
     // by default it goes to table view
     cy.findByTestId('LUPage').findByTestId('table-view').should('exist');
@@ -25,7 +25,7 @@ context('LU Page', () => {
     cy.findByTestId('ProjectTree').within(() => {
       cy.findByText('__TestToDoBotWithLuisSample').click('left');
     });
-    cy.get('.toggleEditMode button').as('switchButton');
+    cy.findByTestId('showcode').as('switchButton');
     // goto edit-mode
     cy.get('@switchButton').click();
     cy.findByTestId('LUPage').get('.monaco-editor').should('exist');

Composer/cypress/integration/NewDialog.spec.ts

@@ -11,9 +11,9 @@ context('Creating a new Dialog', () => {
   it('can create a new dialog from project tree', () => {
     cy.findByTestId('AddFlyout').click();
     cy.findByTestId('FlyoutNewDialog').click();
-    cy.findByTestId('NewDialogName').type('{selectall}__TestNewDialog2{enter}');
+    cy.findByTestId('NewDialogName').type('{selectall}TestNewDialog2{enter}');
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestNewDialog2').should('exist');
+      cy.findByText('TestNewDialog2').should('exist');
     });
   });
 });