feat: manage samples via plugin #2805

boydc2014 · 2020-04-28T13:20:57Z

Closes #2835
Closes #2563 (partially, this PR includes the samples part, will split the task later)

This PR includes

Extend plugin interface to support AddBotTemplate(SampleBot), and AddBaseTemplate(BoilerPlate)

  public addBotTemplate(template: BotTemplate) // Sample bot
  public addBaseTemplate(template: BotTemplate) // Biolerplate

Extend interface of BotTemplate to include two more properties: tags, support to be able to support further operations based on runtime version

export interface BotTemplate {
  id: string;
  name: string;
  description: string;
  path: string; // absolute path
  tags?: string[]; // tags for further grouping and search secenario
  support?: string[]; // list of supported runtime versions
}

Create a samples plugins, which take over the samples and biolerplate, and move the assets from server/assets into plugins/samples/assets
Clean up AssetManager

github-actions · 2020-05-05T08:04:11Z

Coverage remained the same at 0.0% when pulling bb7ef35 on donglei/sample-plugin into c329a2f on master.

boydc2014 · 2020-05-05T12:49:23Z

@cwhitten @a-b-r-o-w-n @benbrown this one is ready for review now

a-b-r-o-w-n · 2020-05-05T17:27:50Z

Composer/package.json

-    "build:plugins": "cd plugins/localPublish && yarn install && yarn build",
+    "build:plugins": "yarn build:plugins:localpublish && yarn build:plugins:samples",
+    "build:plugins:localpublish": "cd plugins/localPublish && yarn install && yarn build",
+    "build:plugins:samples": "cd plugins/samples && yarn install && yarn build",


Why can't these just be a part of the yarn workspaces?

yes, i think those can and should be managed by yarn workspaces, it's just those plugins were not included when we started to use this plugin approach, and i haven't thought about that in this effort.

i created a new ticket to track this work #2901 to keep this one focused, make sense? because this one moved a lot of files, which is very easy to get a conflict.

a-b-r-o-w-n · 2020-05-05T22:25:54Z

Composer/packages/extensions/plugin-loader/src/composerPluginRegistration.ts

+  /**************************************************************************************
+   * Add Base Template (aka, BoilerPlate)
+   *************************************************************************************/
+  public addBaseTemplate(template: BotTemplate) {


I don't really understand this one. What is meant by boilerplate?

Thanks, Andy, boilerPlate is introduced by #2837 which works as a baseTemplate for all sample bot. For example, contains as a README.md that could be copied into any created bot.

This PR don't add any features yet, just refactor the structure.

Composer/packages/lib/shared/src/types/server.ts

Composer/packages/server/__tests__/controllers/project.test.ts

Composer/plugins/samples/src/index.ts

a-b-r-o-w-n · 2020-05-05T22:44:59Z

Composer/plugins/samples/src/index.ts

+const samples = getSamples();
+const biolerplates = getBiolerPlates();
+
+export default async (composer: any): Promise<void> => {


Suggested change

export default async (composer: any): Promise<void> => {

export default async (composer: ComposerPluginRegistration): Promise<void> => {

When i try to refer to pluginLoader package as dependencies, somehow the samples plugin can't build, with this error DefinitelyTyped/DefinitelyTyped#40905, seems related to we have multiple version of types/express-server-core-static, i will see i can fix it today, if not, probably i will keep use any and pick it later when using yarn workspace to manage plugins.

Turns out trickier than i thought. Tracked it in another issue. #2912

boydc2014 · 2020-05-06T08:10:15Z

E2E failed because we have some style changes in #2898, there is a fix in #2913

* master: (58 commits) fix: Copy skill manifests to the correct directory in the localPublish plugin (#2932) feat: Goto Begin Dialog after clicking dialog (#2922) fix: Improved Electron auto update UX (#2925) fix: Action Flow gradual left alignment (#2909) fix: word wrap in SendActivity (#2908) fix: Fixed various onboarding issues and updated content (#2900) chore: Component Governance (#2899) perf: improve property editor performance (#2921) fix: paste blank node (#2905) extract memory variables at lg lsp server (#2902) feat: manage samples via plugin (#2805) can not use event capture in visual editor (#2913) style: make focus styles more consistent (#2898) feat: azure publish plugin (#2733) fix: unable to clear form title (#2885) fix: Populate env variable with AppData folder (#2894) a11y: use Key/Value aria labels in object field (#2890) Fix border issue in visual editor (#2891) fix: changes manifest type from '.manifest' to '.json' (#2888) Fixed packaged folder structure. (#2887) ...

* redo on a clean master * fix dotnet tests path * correct the typo * update all other places * fix the last path * fix paths * remove commented code * fix typo * fix comments * fix comments * update type * align with local publisher * revert the dependency to plugin-loader Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

cwhitten changed the title ~~draft: manage samles via plugin~~ draft: manage samples via plugin Apr 30, 2020

boydc2014 mentioned this pull request Apr 30, 2020

Clean out unused code in assetManager model #2835

Closed

redo on a clean master

2370c68

boydc2014 force-pushed the donglei/sample-plugin branch from 15c747f to 2370c68 Compare May 5, 2020 07:54

boydc2014 changed the title ~~draft: manage samples via plugin~~ feat: manage samples via plugin May 5, 2020

boydc2014 marked this pull request as ready for review May 5, 2020 08:00

boydc2014 requested review from a-b-r-o-w-n, beyackle, corinagum, cwhitten, srinaath and tonyanziano as code owners May 5, 2020 08:00

fix dotnet tests path

bb7ef35

boydc2014 requested a review from luhan2017 as a code owner May 5, 2020 08:01

boydc2014 added 3 commits May 5, 2020 08:06

correct the typo

0d2f193

update all other places

81bac81

fix the last path

56a933f

a-b-r-o-w-n reviewed May 5, 2020

View reviewed changes

merge with master and fix conflicts

5527b7b

boydc2014 requested review from benbrown and carlosscastro as code owners May 6, 2020 02:14

boydc2014 added 7 commits May 6, 2020 02:18

fix paths

8ddc103

remove commented code

aaeb3e8

fix typo

9c28930

fix comments

5a792f9

fix comments

f0cf20b

update type

9880f57

align with local publisher

952554f

revert the dependency to plugin-loader

17b6333

Merge branch 'master' into donglei/sample-plugin

5ba20b2

cwhitten approved these changes May 6, 2020

View reviewed changes

cwhitten merged commit d6c3d61 into master May 6, 2020

cwhitten deleted the donglei/sample-plugin branch May 6, 2020 14:42

a-b-r-o-w-n mentioned this pull request May 15, 2020

release: prepare release notes #3096

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: manage samples via plugin #2805

feat: manage samples via plugin #2805

boydc2014 commented Apr 28, 2020 •

edited

Loading

github-actions bot commented May 5, 2020

boydc2014 commented May 5, 2020

a-b-r-o-w-n May 5, 2020

boydc2014 May 6, 2020 •

edited

Loading

a-b-r-o-w-n May 5, 2020

boydc2014 May 6, 2020 •

edited

Loading

a-b-r-o-w-n May 5, 2020

boydc2014 May 6, 2020 •

edited

Loading

boydc2014 May 6, 2020 •

edited

Loading

boydc2014 commented May 6, 2020

	export default async (composer: any): Promise<void> => {
	export default async (composer: ComposerPluginRegistration): Promise<void> => {

feat: manage samples via plugin #2805

feat: manage samples via plugin #2805

Conversation

boydc2014 commented Apr 28, 2020 • edited Loading

github-actions bot commented May 5, 2020

boydc2014 commented May 5, 2020

a-b-r-o-w-n May 5, 2020

Choose a reason for hiding this comment

boydc2014 May 6, 2020 • edited Loading

Choose a reason for hiding this comment

a-b-r-o-w-n May 5, 2020

Choose a reason for hiding this comment

boydc2014 May 6, 2020 • edited Loading

Choose a reason for hiding this comment

a-b-r-o-w-n May 5, 2020

Choose a reason for hiding this comment

boydc2014 May 6, 2020 • edited Loading

Choose a reason for hiding this comment

boydc2014 May 6, 2020 • edited Loading

Choose a reason for hiding this comment

boydc2014 commented May 6, 2020

boydc2014 commented Apr 28, 2020 •

edited

Loading

boydc2014 May 6, 2020 •

edited

Loading

boydc2014 May 6, 2020 •

edited

Loading

boydc2014 May 6, 2020 •

edited

Loading

boydc2014 May 6, 2020 •

edited

Loading