Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Disable / Enable actions #3416

Merged
merged 23 commits into from
Jul 8, 2020
Merged

feat: Disable / Enable actions #3416

merged 23 commits into from
Jul 8, 2020

Conversation

yeze322
Copy link
Contributor

@yeze322 yeze322 commented Jun 15, 2020

Description

closes #2286

todos:

  • icons for toolbar buttons - Disable / Enable (@DesignPolice )
  • selection states be reflected on Disable/Enable buttons (@yeze322 )
  • do we need 'Disable' / 'Enable' options inside the '...' flyout menu?

Task Item

Screenshots

  1. No action selected
    image
  2. Both 'Disable' and 'Enable' clickable
    image
  3. Only 'Disable' clickable
    image
  4. Only 'Enable' clickable
    image

'Disable' Effects
image
image

@yeze322 yeze322 changed the title Visual/disabled feat: Disable / Enable actions Jun 15, 2020
@yeze322
Copy link
Contributor Author

yeze322 commented Jun 16, 2020

@DesignPolice Hey Marc, you were assigned because we need your input on icons.
Could you help to figure out what's the proper icons for the 'Disable' and 'Enable' button?

Can I find one in the Office Fabric Icon lib?

@hibrenda
Copy link
Contributor

My 2 cents:
Tool bar:

  • disable & enable button state should be more user friendly (eg. after one node disabled, select this node , the disable button should not be clickable)

Overall UX experience:

  • if nodes disabled in visual canvas, could we reflect the state in property panel as well ? sometimes I did not notice such node is disabled but I am still editing.
  • After disable action, the node will be in gray but not easy to tell it is disable gray or none-user interaction node gray (eg. set property) as it is in gray as well. could we let user be more aware of these changes ? @sangwoohaan

schema driven or runtime driven for nested actions

  • add node into disabled if/else branch, this node will be in gray but the schema file does not add disable . so just want to confirm this is runtime driven for nested actions

@coveralls
Copy link

coveralls commented Jun 20, 2020

Coverage Status

Coverage increased (+0.06%) to 53.355% when pulling 2d042d2 on visual/disabled into b669443 on master.

@yeze322 yeze322 marked this pull request as ready for review June 20, 2020 12:18
@a-b-r-o-w-n
Copy link
Contributor

@yeze322 what is the status of this PR? I saw you had some questions out to the design team as well as some UX feedback? Has everything been addressed? If not, can you mark this PR as draft until it is ready again?

@yeze322 yeze322 changed the title feat: Disable / Enable actions [WIP] feat: Disable / Enable actions Jun 24, 2020
@yeze322
Copy link
Contributor Author

yeze322 commented Jun 24, 2020

@a-b-r-o-w-n yeah, waiting for two design feedbacks:

  1. Icons
  2. Toolbar button UX (in our scrum the decision is to hide all unavailable buttons, currently I just make unavailable buttons gray)

@a-b-r-o-w-n a-b-r-o-w-n marked this pull request as draft June 24, 2020 21:14
@yeze322 yeze322 changed the title [WIP] feat: Disable / Enable actions feat: Disable / Enable actions Jul 6, 2020
@yeze322 yeze322 marked this pull request as ready for review July 6, 2020 02:35
@a-b-r-o-w-n a-b-r-o-w-n marked this pull request as draft July 6, 2020 17:56
@a-b-r-o-w-n a-b-r-o-w-n marked this pull request as ready for review July 6, 2020 17:56
@a-b-r-o-w-n
Copy link
Contributor

@yeze322 Can you address the conflict?

Also, it wasn't clear to me if this is ready for review based on yesterday's standup? Are we still waiting on something from design?

@mareekuh
Copy link
Contributor

mareekuh commented Jul 8, 2020

Addressed here and discussed in several standups.
https://www.figma.com/file/LlTlh5vXwq91zjGnFtrUUR6l/Composer-main-design-spec-UI-library?node-id=2968%3A27508

For more questions, feel free to reach out to me.
The design impacts toolbars across the app.

@yeze322
Copy link
Contributor Author

yeze322 commented Jul 8, 2020

@a-b-r-o-w-n just adapted to new design, now it's ready.

@cwhitten cwhitten merged commit 99b1246 into master Jul 8, 2020
@cwhitten cwhitten deleted the visual/disabled branch July 8, 2020 16:56
@cwhitten cwhitten mentioned this pull request Jul 8, 2020
GeoffCoxMSFT added a commit that referenced this pull request Jul 10, 2020
* fix: add logo-clicking to tests (#3500)

* add logo-clicking to tests

* bump elliptic version

* Update yarn.lock

Co-authored-by: Andy Brown <asbrown002@gmail.com>

* feat: support validate lg custom functions (#3273)

* fix: support validate lg custom functions and separate the dialog validation from parser

* use file name as namespace

* add unit test

* fix lint

* fix: inline editing LU mess up whole file (#3478)

* upgrade lu packages

* update package

* clean

* update

* clean up

Co-authored-by: Andy Brown <asbrown002@gmail.com>

* refactor: change term primary key to authoring key (#3516)

Co-authored-by: Andy Brown <asbrown002@gmail.com>

* fix: replace the endpoint to authoringEndpoint when publishing luis (#3517)

Co-authored-by: Andy Brown <asbrown002@gmail.com>

* propagate code editor settings to all editor surfaces (#3520)

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* run coverage on all source files (#3522)

without this config, jest would only collect coverage on files that were imported in a test

* feat: add loading indicator when waiting on form data or schema to load (#3523)

* move AdaptiveForm components out of sub directory

* show loading spinner while waiting for form data and schema

Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>

* feat: allow inputting path (#3302)

* allow input path

* handle corner case

* lint fix

* fix the flicker issue

* update UX and create or update folder operation

* refine code structure

* remove commented code

* fix unit test

* use esc to cancel operation

* handle comments

* handle comments

* add test case

* fix test case

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* chore: Index file renames part 1 (#3519)

* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Renamed components, hooks, Onboarding only

* Renamed components, hooks, Onboarding only

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Fixing imports

* test: increase 'adaptive-flow' test coverage to 77% (#3530)

* + UT: adaptive-flow-renderer/widgets

* + UT: adaptive-flow-editor/utils

* remove unref hook: useWindowDimension

* + UT: KeyboardZone

* + UT: cursorTracker

* + UT: adaptive-flow-editor/constants

* +UT: AdaptiveFlowEditor

* + UT: adaptive-flow-editor/contexts

* + UT: useEditorEventApi

* fix CI error

* + UT: NodeWrapper

* + UT: EdgeMenu

* KeyboardZone behavioror test

* change the test file structure of cursorTracker

* update a test case (#3531)

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* fix lgWorker test failure (#3529)

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* chore: adds webpack bundle analyzer (#3542)

* issues#3309

* fixes lints

* Default to bot settings if no route cache

* fix: #3485

* fix: #3486 Debug/Fix HMR support

* webpack bundle analyzer

Co-authored-by: Soroush <sorgh@microsoft.com>
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>

* refactor: split some actions off setSettings (#3525)

* split some actions off setSettings

* add more actions - eject still not working

* fix arguments in eject

* split some actions off setSettings

* add more actions - eject still not working

* fix arguments in eject

* Update setting.ts

* fix some tests

* Update index.ts

* move logo-clicking to commands.ts

* Update commands.ts

* fix: Dialog validate throw error when delete an action (#3537)

* fix: Dialog validate throw error when delete an action

* use optional chaining and more explicit length check

* fix lint

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>

* fix: composer will crashed when add a new publish profile (#3550)

* replace function callbacks with arrows (#3545)

Co-authored-by: Andy Brown <asbrown002@gmail.com>

* fix: location initialization (#3549)

* fix bug

* fix e2e test

* fix bug

* chore: Index file renames part 2 (#3546)

* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Renamed components, hooks, Onboarding only

* Renamed components, hooks, Onboarding only

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Fixing imports

* Index file renames Part 2

* fix: deploy issue while zipping the folder (#3557)

* move bot-deploy to plugins

* fix profile edit and save not saving to settings

* add dependency to electron-server

* update settings file clicking customized runtime toggle

Co-authored-by: Wenyi Luo <wenyluo@microsoft.com>
Co-authored-by: Dong Lei <donglei@microsoft.com>

* docs: archive old docs (#3572)

Co-authored-by: Andy Brown <asbrown002@gmail.com>

* chore(deps-dev): bump electron from 8.0.2 to 8.2.4 in /Composer (#3577)

Bumps [electron](https://github.com/electron/electron) from 8.0.2 to 8.2.4.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md)
- [Commits](electron/electron@v8.0.2...v8.2.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tony Anziano <toanzian@microsoft.com>

* Bumped electron-builder config to correct electron version. (#3584)

* doc: add some missing details to plugin readme (#3585)

* handle schema parsing error better (#3586)

* fix nodemon `--inspect` error in lgWorker (#3590)

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* feat: Disable / Enable actions (#3416)

* impl disable/enable editor API

* disable / enable e2e

* propagate the 'disabled' property

* take css out of CardTemplate

* take css out of ActionHeader

* connect to the 'disabled' property in data

* CSS: disbaled effect

* update icon of Disabled/Enabled

* rename inheritParentProperty

* shallow copy json in IndexedNode to support immutable

* rename files with  '.style' suffix

* apply disable effect to PromptWidget

* only disable nodes when disabled === true

* contextual Disable/Enable btn state

* move disable/enable button into toolbar

* avoid undefined array in UT

* release: 1.0.2 (#3595)

* Change versions

* Adds 1.0.2.md

* update uncategorized commits

Co-authored-by: Andy Brown <asbrown002@gmail.com>

* chore: Moved styles inline for components in client package. (#3598)

* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Renamed components, hooks, Onboarding only

* Renamed components, hooks, Onboarding only

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Fixing imports

* Index file renames Part 2

* Inlined styles in ts

* Fixed test mocks

* feat: grouping Toolbar buttons under the 'Edit' dropdown button (#3608)

* let ToolBar support 'dropdown' type

* move 'design' page only toolbar items into DesignPage

* migrate 'Add New Trigger' coachmark feature

* grouping 'Edit' buttons together as a dropdown

* loosen 'type' TS type in toolbar

* fix: Syntax error when creating a "Send a response" node (#3604)

* refine diagnostics

* fix lg parse line number range

* update inline diagnostic

* update test

* resue websocket connection

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* Merge from master with fixes

Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
Co-authored-by: Zhixiang Zhan <zhixzhan@microsoft.com>
Co-authored-by: liweitian <liweitian93@outlook.com>
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: zeye <2295905420@qq.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: Soroush <sorgh@microsoft.com>
Co-authored-by: Wenyi Luo <wenyluo@microsoft.com>
Co-authored-by: Dong Lei <donglei@microsoft.com>
Co-authored-by: Yan Liu <32497439+zxyanliu@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tony Anziano <toanzian@microsoft.com>
Co-authored-by: Ben Brown <benbro@microsoft.com>
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
* impl disable/enable editor API

* disable / enable e2e

* propagate the 'disabled' property

* take css out of CardTemplate

* take css out of ActionHeader

* connect to the 'disabled' property in data

* CSS: disbaled effect

* update icon of Disabled/Enabled

* rename inheritParentProperty

* shallow copy json in IndexedNode to support immutable

* rename files with  '.style' suffix

* apply disable effect to PromptWidget

* only disable nodes when disabled === true

* contextual Disable/Enable btn state

* move disable/enable button into toolbar

* avoid undefined array in UT
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support disabled nodes in visual editor
8 participants