lg editor #87

youyu16 · 2019-03-28T10:06:44Z

make a workaroud for show lg content. will change when lg parser is ready

cwhitten · 2019-04-09T13:42:52Z

@youyu16 what is the status of this change? it's starting to get stale.

youyu16 · 2019-04-10T01:39:10Z

@cwhitten this is pending on the lg parser from botbuilder-js and some changes about files api. I have a local version rebase from master everyday, but import a local version of lg parser and make a work around about how to read lg files is not a proper way. may abandon this and create a new one when ready.

youyu16 · 2019-04-15T12:04:25Z

@cwhitten please notice that show lg content is only working in this branch. this is just a workaround.

cwhitten · 2019-04-15T15:22:04Z

can you please address conflicts that this branch has with master?

youyu16 · 2019-04-16T02:16:56Z

@cwhitten fix the UT and conflict with master.

cwhitten · 2019-04-17T15:15:11Z

@youyu16 will you be updating this branch to include writing to the lg file?

youyu16 · 2019-04-18T01:42:54Z

@cwhitten yes, I will update this branch include writing to the lg file, I need some time to refactor it using the latest get dialog/lg api which checked in yesterday.

youyu16 · 2019-04-18T15:55:24Z

lg file auto save should working now

boydc2014 · 2019-04-18T17:57:52Z

yarn lint is complaining, you might want to run yarn lint --fix

boydc2014 · 2019-04-18T18:13:28Z

Composer/packages/client/src/store/reducer/index.js

state.dialogs == lgTemplates?

huh, my bad

boydc2014 · 2019-04-18T18:14:42Z

Composer/packages/server/src/models/bot/botProject.ts

if i understand this correct, this api is for updating one lg template, right? then why this is writing the whole content to the file?

boydc2014 · 2019-04-18T18:19:26Z

Composer/packages/client/src/components/StorageExplorer/index.js

why LG editor affect storageExplorer?

this is a small change to let detail list header stick to the top when you scroll.

let's make it another PR, I guess

boydc2014

lgEditor/index.js is empty?

boydc2014 · 2019-04-18T18:25:33Z

Composer/packages/client/src/pages/content/lg-settings/index.js

ah, i see, so you merge all lgTemplate to write in here, in client? I think it's better to do this in server, because

you don't have to pass a lot of data to server

server have more knowledge, can do the merge better. Server can utilize the knowledge it gains when parsing it to do the job better.

boydc2014 · 2019-04-18T18:27:49Z

Composer/packages/server/src/router/api.ts

this definition of api implies that you are updating a single template, but you actually updating the whole lg file

boydc2014 · 2019-04-18T18:31:05Z

SampleBots/Planning - ToDoBot/demo.lg

is this demo.lg been loaded and used by dialog?

boydc2014 · 2019-04-18T18:31:57Z

I fixed the lint issue and leave some comments @youyu16

cwhitten

This is getting close. I'd like to see the following:

Tests! Thank you.
Merging all LG files into one editing UI. Do we want that? Let's discuss at the next scrum meeting.
There is a mix of using emotion for css-in-js and inline styles. let's move everything to emotion.

boydc2014 · 2019-04-19T02:49:00Z

This is getting close. I'd like to see the following:

Tests! Thank you.

Merging all LG files into one editing UI. Do we want that? Let's discuss at the next scrum meeting.

There is a mix of using emotion for css-in-js and inline styles. let's move everything to emotion.

Thanks @cwhitten for bring up #2, this is something i talked with Rachel and Marieke multiple time and still not been convinced that we should hide multiple files behind user. let's talk this in next scrum.

Composer/packages/server/src/models/bot/interface.ts

Composer/packages/server/src/models/bot/indexers/lgIndexers.ts

Composer/packages/server/src/models/bot/indexers/index.ts

boydc2014 · 2019-04-22T12:58:00Z

Composer/packages/server/src/models/bot/indexers/lgIndexer.ts

This should be using IFileStorage

cwhitten · 2019-04-22T15:45:54Z

Composer/packages/client/src/pages/content/index.js

can this get extracted to emotion?

Composer/packages/client/src/pages/content/index.js

Composer/packages/client/src/pages/content/lg-settings/index.js

Composer/packages/client/src/pages/content/lu-settings/index.js

SampleBots/Planning - ToDoBot/welcome.lg

boydc2014 · 2019-04-23T13:24:36Z

Looks good to me, @youyu16 but there is some conflict to resolve

boydc2014

Please resolve the conflict and fix the css issue

youyu16 requested review from a-b-r-o-w-n, boydc2014, cwhitten and luhan2017 as code owners March 28, 2019 10:06

youyu16 force-pushed the tianyu/lgeditor branch from 132a5fd to 62a29e7 Compare April 12, 2019 05:42

youyu16 force-pushed the tianyu/lgeditor branch from 6cbd7ef to 3c5f359 Compare April 16, 2019 02:09

youyu16 force-pushed the tianyu/lgeditor branch 2 times, most recently from a12da7c to 87d0d38 Compare April 18, 2019 15:54

boydc2014 reviewed Apr 18, 2019

View reviewed changes

boydc2014 suggested changes Apr 18, 2019

View reviewed changes

boydc2014 reviewed Apr 18, 2019

View reviewed changes

SampleBots/Planning - ToDoBot/demo.lg Outdated

Copy link

Contributor

boydc2014 Apr 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this demo.lg been loaded and used by dialog?

boydc2014 changed the title ~~[WIP] lg editor~~ lg editor Apr 18, 2019

cwhitten suggested changes Apr 19, 2019

View reviewed changes

boydc2014 reviewed Apr 19, 2019

View reviewed changes

Composer/packages/server/src/models/bot/interface.ts Outdated Show resolved Hide resolved

boydc2014 reviewed Apr 19, 2019

View reviewed changes

Composer/packages/server/src/models/bot/indexers/lgIndexers.ts Outdated Show resolved Hide resolved

boydc2014 reviewed Apr 22, 2019

View reviewed changes

Composer/packages/server/src/models/bot/indexers/index.ts Outdated Show resolved Hide resolved

youyu16 force-pushed the tianyu/lgeditor branch from 9b107af to 7ae9b01 Compare April 22, 2019 11:29

boydc2014 reviewed Apr 22, 2019

View reviewed changes

Composer/packages/server/src/models/bot/indexers/lgIndexer.ts Outdated

Copy link

Contributor

boydc2014 Apr 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be using IFileStorage

cwhitten suggested changes Apr 22, 2019

View reviewed changes

Tianyu You and others added 16 commits April 23, 2019 19:15

add lg editor

6e449b1

make header stick on the top and base table for lg editor

6f92426

detail list for lg content

8cc1aff

workaround for show lg content

789c52c

simplify the editor

fc7ff0f

fix test

af45f3a

fix template selector

875ccd6

update lg file is working

dc615d3

fix lint error

9d551a3

fix typo

7e396db

group the lg templates

2e69afb

lg editor is grouped and working now

bce0caa

clean up the file and add some test

8f47e5f

fix lint

b5c8dad

fix comments

9f596f6

fix lint

feb4d65

boydc2014 approved these changes Apr 23, 2019

View reviewed changes

boydc2014 self-requested a review April 23, 2019 13:26

boydc2014 suggested changes Apr 23, 2019

View reviewed changes

remove some useless thing.

1a9ef59

youyu16 force-pushed the tianyu/lgeditor branch from 4c39ec1 to 1a9ef59 Compare April 23, 2019 13:33

boydc2014 approved these changes Apr 23, 2019

View reviewed changes

cwhitten approved these changes Apr 23, 2019

View reviewed changes

cwhitten merged commit fdce675 into master Apr 23, 2019

cwhitten deleted the tianyu/lgeditor branch April 23, 2019 16:46

lg editor #87

lg editor #87

Uh oh!

Conversation

youyu16 commented Mar 28, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cwhitten commented Apr 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

youyu16 commented Apr 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

youyu16 commented Apr 15, 2019

Uh oh!

cwhitten commented Apr 15, 2019

Uh oh!

youyu16 commented Apr 16, 2019

Uh oh!

cwhitten commented Apr 17, 2019

Uh oh!

youyu16 commented Apr 18, 2019

Uh oh!

youyu16 commented Apr 18, 2019

Uh oh!

boydc2014 commented Apr 18, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

boydc2014 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

boydc2014 Apr 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

boydc2014 commented Apr 18, 2019

Uh oh!

cwhitten left a comment

Choose a reason for hiding this comment

Uh oh!

boydc2014 commented Apr 19, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

boydc2014 commented Apr 23, 2019

Uh oh!

boydc2014 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

youyu16 commented Mar 28, 2019 •

edited

Loading

cwhitten commented Apr 9, 2019 •

edited

Loading

youyu16 commented Apr 10, 2019 •

edited

Loading

boydc2014 Apr 18, 2019 •

edited

Loading