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.

Sign up for GitHub

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

Jump to bottom

fix: deploy issue while zipping the folder #3557

Merged
merged 7 commits into from
Jul 7, 2020
Merged

fix: deploy issue while zipping the folder #3557

merged 7 commits into from
Jul 7, 2020

Conversation

lei9444
Copy link
Contributor

@lei9444 lei9444 commented Jul 3, 2020 •
edited by boydc2014
Loading

Description

Today plugins use bot-deploy as local dependency in package.json. But the archiver doesn't work in this pattern(I don't know the reason now. I have added archiver to test in the plugins and composer server, it works).

The bot-deploy is only used by plugins. So I move it to plugins' lib folder and add a yarn workspace for plugins.

I also merged #3556 to fix the profile save issue, this will break the publish workflow.

Task Item

fixes #3301
refs #3536

Screenshots

@coveralls
Copy link

coveralls commented Jul 3, 2020 •
edited
Loading

Coverage Status

Coverage increased (+0.009%) to 53.277% when pulling c0319d6 on lei9444:test into f9128fb on microsoft:master.

@boydc2014
Copy link
Contributor

@cwhitten this is the fix that I believe eventually resolve the "archiver" not working issue without have to switching to "zip-folder" (which depends on a lower version of lodash, thus not passing secuirty check).

we tested this both in web app and in electron and it's working as expected E2E.

@boydc2014 boydc2014 added the Approved to merge approved, waiting to be merged label Jul 3, 2020
@VanyLaw VanyLaw mentioned this pull request Jul 6, 2020
Closed
6 tasks
@a-b-r-o-w-n
Copy link
Contributor

Are the other changes un-releated to the workspace change meant to be in this PR? Specifically the runtime settings changes?

@lei9444
Copy link
Contributor Author

lei9444 commented Jul 6, 2020 •
edited
Loading

Are the other changes un-releated to the workspace change meant to be in this PR? Specifically the runtime settings changes?

Hi, @a-b-r-o-w-n I just merged @VanyLaw 's PR about profile can not be saved issue. Remove this change will make the publish fail. The PR is #3556.

Do you think we need to move the un-releated changes to another PR? Maybe I can drop the commit and reopen @VanyLaw 's PR #3556.

@boydc2014
Copy link
Contributor

Are the other changes un-releated to the workspace change meant to be in this PR? Specifically the runtime settings changes?

Hi, @a-b-r-o-w-n I just merged @VanyLaw 's PR about profile can not be saved issue. Remove this change will make the publish fail. The PR is #3556.

Do you think we need to move the un-releated changes to another PR? Maybe I can drop the commit and reopen @VanyLaw 's PR #3556.

I think this one is now considered as an fix to the E2E publishing workflow, it fixes the zipping stucking issue and fix the publishing profile not saving issue. I suggest we take this one. @a-b-r-o-w-n what do you think

@a-b-r-o-w-n
Copy link
Contributor

@boydc2014 I haven't had a chance to test this. So if you feel like it is good, let's merge.

@boydc2014 boydc2014 merged commit 532c757 into microsoft:master Jul 7, 2020
@hibrenda hibrenda mentioned this pull request Jul 8, 2020
Closed
@cwhitten cwhitten mentioned this pull request Jul 8, 2020
Merged
GeoffCoxMSFT added a commit that referenced this pull request Jul 10, 2020
@GeoffCoxMSFT @beyackle
@a-b-r-o-w-n @lei9444 @zhixzhan @liweitian @cwhitten @yeze322 @hatpick @sorgh @VanyLaw @boydc2014 @zxyanliu @dependabot @tonyanziano @benbrown
chore: merge from master (#3616)
f0020d1 
* 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 lei9444 deleted the test branch February 1, 2021 02:05
lei9444 added a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
@lei9444 @VanyLaw @boydc2014
fix: deploy issue while zipping the folder (microsoft#3557)
fc33f24 
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@boydc2014 boydc2014 boydc2014 approved these changes

@a-b-r-o-w-n a-b-r-o-w-n Awaiting requested review from a-b-r-o-w-n a-b-r-o-w-n is a code owner

@beyackle beyackle Awaiting requested review from beyackle

@cwhitten cwhitten Awaiting requested review from cwhitten cwhitten is a code owner

@srinaath srinaath Awaiting requested review from srinaath srinaath is a code owner

@tonyanziano tonyanziano Awaiting requested review from tonyanziano

Assignees
No one assigned
Labels
Approved to merge approved, waiting to be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Publishing -> Error: Only absolute URLs are supported
5 participants
@lei9444 @coveralls @boydc2014 @a-b-r-o-w-n @VanyLaw