fix: Updates regular expressions naming in recognizer types #4297

stevkan · 2020-09-30T00:36:05Z

Description

The naming convention between the different recognizer types is inconsistent when the user clicks on the associated dropdown. These changes are implemented to bring consistency across various JSON, .spec.ts, .dialog, and .md files.

Task Item

Closes #4060

Screenshots

…nizer type; updated READMEs on same for consistency

coveralls · 2020-09-30T00:53:27Z

Coverage increased (+0.4%) to 55.994% when pulling 2e92eab on stevkan:stevkan/update-recognizer-type-naming-rule into c5e31b6 on microsoft:main.

a-b-r-o-w-n

I'll have to say that "regular expressions recognizer" doesn't seem as correct as "regular expression recognizer". @zxyanliu how did we arrive at using the plural to describe the recognizer?

docs/archived docs/tutorial/tutorial-add-dialog.md

docs/olddocs/triggers_and_events.md

zxyanliu · 2020-09-30T16:24:37Z

I'll have to say that "regular expressions recognizer" doesn't seem as correct as "regular expression recognizer". @zxyanliu how did we arrive at using the plural to describe the recognizer?

@a-b-r-o-w-n we did not arrive at using the plural to describe the recognizer, I shared my opinion on the casing in this issue:
#4060 (comment)

Also, in terms of singular or plural, I am suggesting the singular form:
#4060 (comment)

stevkan · 2020-10-01T01:05:27Z

Moving from singular to plural was something I had suggested as a consideration. It looks like @zxyanliu picked up on it, unintentionally, which I then took as confirmation.

I'll correct those instances back to singular that should be.

…4312)

* update default extensions directory * load builtin and remote extensions the same way * refactor installing remote extensions * update default extension manifest location * refactor removing an extension * add tests for npm * add search method to npm module * improve error logging * add tests for downloading extension * refactor manager tests * deprecate extendsComposer * add test for loadFromDir * add more manager tests * use npm registry api to search * omit installed extensions from search * add getBundle test * remove rimraf, use remove from fs-extra * make remvoing builtin a no-op * add rimraf back to dev deps * fix security warning by resolving to terser-webpack-plugin version * ensure extensions cannot be installed outside remoteDir * supress lgtm error

* Form dialogs init * new design * UX comments * conflicts resolved * yarn * click outside to dismiss expanded * Fix yarn.lock * PR comments * fix demo Co-authored-by: Soroush <sorgh@microsoft.com>

* fix: Fixed useArrayItems and useObjectItems * lint

Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>

zxyanliu · 2020-10-06T17:08:10Z

Composer/cypress/integration/TriggerCreation.spec.ts

    cy.visitPage('Design');
    cy.findByTestId('recognizerTypeDropdown').click();
-    cy.findByText('Regular Expression').click();
+    cy.findByText('Regular expressions recognizer').click();


Suggested change

cy.findByText('Regular expressions recognizer').click();

cy.findByText('Regular expression recognizer').click();

zxyanliu · 2020-10-06T17:08:52Z

Composer/packages/server/src/locales/en-US.json

-  "regular_expression_855557bf": {
-    "message": "Regular Expression"
+  "regular_expressions_recognizer_c11bbdda": {
+    "message": "Regular expressions recognizer"


Suggested change

"message": "Regular expressions recognizer"

"message": "Regular expression recognizer"

zxyanliu · 2020-10-06T17:09:11Z

Composer/packages/ui-plugins/composer/src/defaultRecognizerSchema.ts

 export const DefaultRecognizerSchema: RecognizerUISchema = {
  [SDKKinds.RegexRecognizer]: {
-    displayName: () => formatMessage('Regular Expression'),
+    displayName: () => formatMessage('Regular expressions recognizer'),


Suggested change

displayName: () => formatMessage('Regular expressions recognizer'),

displayName: () => formatMessage('Regular expression recognizer'),

zxyanliu · 2020-10-06T17:12:08Z

Hi @stevkan I left several comments, also we do not need to update the docs here since they were achived.
Other than those, the PR looks good to me. Thanks!

* Form dialogs init * new design * UX comments * conflicts resolved * yarn * click outside to dismiss expanded * Fix yarn.lock * PR comments * fix demo * undo/redo feature * undo allow * PR comments Co-authored-by: Soroush <sorgh@microsoft.com>

* refactor plugin host webpack config * add bundleId to publish type config * add types package * update yarn build:dev and add @bfc/tools to deps * build client before server * update imports to use @bfc/types * fix getBundleForView test * update remaining extension type references * fix additionalProperties typing * add @bfc/ui-shared where missing * fix extensions controller test * do not extract comments when bundling react * apply pr feedback * update more imports from shared to types * convert interfaces to types

* Update en-US.json * restore en-US.json

…rm (microsoft#4342) Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* eable luFeatures config * update * update package * upgrade package * update Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* Added schema for bot project support Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Add 1.0 botproject schema Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Fix typo Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Updated gitignore Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Typo fixed Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Following sdk.schema approach to specificy object type using ref Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Co-authored-by: Srinaath Ravichandran <srravich@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* put 'flowWidgets' under 'widgets' * share 'LuIntentEditor' via widgets Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

…t#4140) * Adding va core template plug in with corresponding plugin build steps * Adding env variable feature flag around VA=Core template * removing unused code that was initially added for custom runtime which has been removed * Updating react version in creation extension * Formatting template strings for localization Co-authored-by: Patrick Volum <pavolum@microsoft.com>

* Adding va core template plug in with corresponding plugin build steps * Adding env variable feature flag around VA=Core template * removing unused code that was initially added for custom runtime which has been removed * Added creation UI workspace which is linked to and referenced from client package creation flow, Moved some UI assets to shared UI lib for cross workspace reuse, added creation UI experience for va-core template * Minor styling changes * Cleaning up code for review: Moved to standard styling practices, normalized file content structure, added formatMessage() to UI strings, misc clean up * Cleaning up unused changes * removing bot type tile * removing bot type tile * Making requested PR changes, general clean up, conversion of interfaces to types, adding error catching * Converting props types to intersaction with reach router, adding await back to createProject function * Fixing files to follow repoo linting rules * Changed post creation logic to execute on useEffect as opposed to reliance on await * resolve reentry bug * removing unused function * Fixing linting errors * resolve reentry bug * Fixing reference * Updating react version in creation extension * Updating react version in creation extension * Making PR changes * Fixed non static formatMessage calls * minor syntax refactoring * Refactoring state management for more modular state. Implemented local state relationship to prevent excessive rerenders * Making additional state management changes for better readability and performance. minor clean up of interface and file names * Fixing file naming * Formatting template strings for localization * changing ReachRouter version dpendency to match client reach/router version * update Azure Publish yarn.lock * Updating reach router version and tamplate name Co-authored-by: Patrick Volum <pavolum@microsoft.com>

* chore: clear CI yarn cache and update checksum * update the cache * don't use cache * update test * update the test

* zoom in out * add removeEventListener * add zoom into recoil * button * ux adjust * 1. flash when click button 2, add home button 3, set min zoom out to 50% 4, add disabled state * disable style * transform position not move * rename function name & fix some bug * zoom scroll * scroll to top Co-authored-by: Andy Brown <asbrown002@gmail.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> Co-authored-by: zeye <zeye@microsoft.com>

* Guard selectors against partially loaded project Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Group the dependancies Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Fix unit test Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Co-authored-by: Srinaath Ravichandran <srravich@microsoft.com> Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>

Tests pass locally, forcing merge while CI is busted.

Forcing commit. UTs pass for code on local machine but CI is still broken.

* decompose shell and api into smaller types * nest plugin pages under bot scope * simplify webpack config * make extension client external * add mechanism to sync client shell to iframe plugin host * only fetch extensions when app mounts * add plugin pages selector * output source maps with extension bundles * rename file * clean up manifest after loading extensions * add project api hook * update sample plugin to use project api * disable sample-ui-plugin * do not sync store to window * re-order useEffects

* Fix microsoft#4294 - Disable the default timeout for requests on the LU build step which can take > 2 minutes for large models * Update main.yml Temporarily clearing the yarn cache trying to fix a CI build failure problem. * Update project.ts No idea why editing the workflow from GitHub caused this change, removing it. * Update main.yml * Update main.yml * Update main.yml * Update main.yml * Update main.yml * Update main.yml * Update main.yml * Update main.yml * Update main.yml * Trying if cache is good and clean * restoring the update of checksums * removing temp yarn cache clear * Update main.yml Restoring yarn cache clean Co-authored-by: Ben Brown <benbro@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* lu reference * update * update * minimal publish model * update resolver * update package * update * support path based resolve * support wildcard match * / ** * update * resolver support .qna file ext * define source qna in bot structure * include dialog name in source qna name * qnaIndexer update * update * create qna file for imported url & name * update * enable source qna in all up view * import url sync all locale * update import name * qna parse more infomation * keep header in qna crud * group source.qna in dialog.qna * refactor qnaUtil curd methods * refactor qna all up view * update * remove > !# @source.name in options * do not insert \n before section * update * remove source from nav tree * enable multi turn * create qna file for imported url & name * update package * imports methods * remove import in table-view * update * update * enable multiturn * remove file state * update style * handle focus states * clean install * rename * refactor create qna modal * ... menuItems for navTree * rename * create from scratch & url * clean up * fix build * update * update all up view UX * creation flow from qna scratch * edit container name * update css * update css * migrate exist qna to container * edit url source * update css * update css * clean up * update bf-lu package * update * update ux * creation back * update * fix create qna bot * update css * update container edit * update tests * update to multi projectId * fix bug and update css * fix bug * add tests * resolve merge conflict * update * use notification card * unify create qna modal * show code & back KB * rename migrated file to *-munual.source.qna * clean * update css * update styles * update tests * revert test * update showcode button test id * resolve comments * resolve types * update * required validation * edit field height * update * update * expand row index * craete QnA pair controls * update * fix empty group creation * not change backgroud when switch to scratch * update * height * update * update * resolve merge conflict * fix creation * fix bug * show + when hover Co-authored-by: liweitian <liweitian93@outlook.com> Co-authored-by: Weitian Li <weitli@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

* Added jsonSchema and trigger content * Fix for filtering skill manifests * PR fixes * Fixing baseName and test issue

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

…oft#4383) * decompose shell and api into smaller types * nest plugin pages under bot scope * simplify webpack config * make extension client external * add mechanism to sync client shell to iframe plugin host * only fetch extensions when app mounts * add plugin pages selector * output source maps with extension bundles * rename file * clean up manifest after loading extensions * add project api hook * update sample plugin to use project api * disable sample-ui-plugin * do not sync store to window * prepare test-utils and types for publishing * update package references to published pacakges * add types package * remove shared dependency from extension-client * remove data from shell * more types updates * add useFormHook to expose current form data * re-order useEffects * add missing import * move types to dependencies * fix type errors * add missing dependency * fix tests * remove old comments * update lockfile * use stub currentDialog when none found * fix build:dev * fix merge conflict * add @botframework-composer/types to client

…nizer type; updated READMEs on same for consistency

…github.com/stevkan/BotFramework-Composer into stevkan/update-recognizer-type-naming-rule

stevkan added 2 commits September 29, 2020 13:14

Updated Regular Expression to Regular expressions recognizer in recog…

0f53895

…nizer type; updated READMEs on same for consistency

Updates regular expressions casing in .md files

5e316b8

stevkan requested a review from cwhitten September 30, 2020 00:36

stevkan requested review from GeoffCoxMSFT, a-b-r-o-w-n, benbrown, beyackle, boydc2014, hatpick, srinaath, tonyanziano and yeze322 as code owners September 30, 2020 00:36

stevkan changed the title ~~Updates regular expressions naming in recognizer types~~ fix: Updates regular expressions naming in recognizer types Sep 30, 2020

a-b-r-o-w-n suggested changes Sep 30, 2020

View reviewed changes

docs/archived docs/tutorial/tutorial-add-dialog.md Show resolved Hide resolved

docs/olddocs/triggers_and_events.md Show resolved Hide resolved

beyackle and others added 7 commits October 1, 2020 15:50

Merge branch 'main' into stevkan/update-recognizer-type-naming-rule

2f885fb

fix: Move skill settings into settings.skillConfiguration (microsoft#…

2011ccd

…4312)

feat: form dialog extension (microsoft#4296)

34f53c1

* Form dialogs init * new design * UX comments * conflicts resolved * yarn * click outside to dismiss expanded * Fix yarn.lock * PR comments * fix demo Co-authored-by: Soroush <sorgh@microsoft.com>

Update en-US.json (microsoft#4322)

f9e3ca8

fix: Fixed useArrayItems and useObjectItems (microsoft#4323)

35f3c9b

* fix: Fixed useArrayItems and useObjectItems * lint

fix: only show enabled extension pages (microsoft#4321)

b307bfe

Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>

a-b-r-o-w-n self-requested a review October 6, 2020 16:55

a-b-r-o-w-n assigned zxyanliu Oct 6, 2020

zxyanliu reviewed Oct 6, 2020

View reviewed changes

hatpick and others added 2 commits October 6, 2020 12:53

GeoffCoxMSFT and others added 25 commits October 8, 2020 16:24

Updating to latest version of generate library (microsoft#4341)

9c33b67

Update runtime package to 4.10.5 (microsoft#4343)

11269c7

fix: restore localization JSON file (microsoft#4347)

ee5c34f

* Update en-US.json * restore en-US.json

fix: Added the designer id to the root property id in the Adaptive Fo…

a4471e7

…rm (microsoft#4342) Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

feat: lu features setting (microsoft#4318)

81e1b81

* eable luFeatures config * update * update package * upgrade package * update Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

fix: share 'LuIntentEditor' widget across recognizers (microsoft#4350)

9e98dfc

* put 'flowWidgets' under 'widgets' * share 'LuIntentEditor' via widgets Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>

feat: Added support for nested fieldsets (microsoft#4364)

68cb8bb

chore: remove the ci yarn cache [TEST] (microsoft#4369)

e000405

* chore: clear CI yarn cache and update checksum * update the cache * don't use cache * update test * update the test

Fixed platform specific location expection (microsoft#4375)

2a15dd4

Tests pass locally, forcing merge while CI is busted.

feat: Form dialogs within Composer UX (microsoft#4362)

fcc9aca

Forcing commit. UTs pass for code on local machine but CI is still broken.

feat: Added jsonSchema and trigger content (microsoft#4353)

d40fd3c

* Added jsonSchema and trigger content * Fix for filtering skill manifests * PR fixes * Fixing baseName and test issue

fix: Fetch form dialog templates behind the flag (microsoft#4388)

2ea3f45

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

Updated Regular Expression to Regular expressions recognizer in recog…

72a51a6

…nizer type; updated READMEs on same for consistency

Updates regular expressions casing in .md files

a72d565

Changed pluralization of expressions to expression

94ca993

Merge branch 'stevkan/update-recognizer-type-naming-rule' of https://…

2e92eab

…github.com/stevkan/BotFramework-Composer into stevkan/update-recognizer-type-naming-rule

stevkan requested review from carlosscastro and luhan2017 as code owners October 15, 2020 21:51

stevkan closed this Oct 15, 2020

stevkan deleted the stevkan/update-recognizer-type-naming-rule branch October 15, 2020 22:07

zxyanliu mentioned this pull request Oct 15, 2020

fix: Updates regular expressions formatting and naming convention #4398

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Updates regular expressions naming in recognizer types #4297

fix: Updates regular expressions naming in recognizer types #4297

Uh oh!

stevkan commented Sep 30, 2020 •

edited by a-b-r-o-w-n

Loading

Uh oh!

coveralls commented Sep 30, 2020 •

edited

Loading

Uh oh!

a-b-r-o-w-n left a comment

Uh oh!

Uh oh!

Uh oh!

zxyanliu commented Sep 30, 2020 •

edited

Loading

Uh oh!

stevkan commented Oct 1, 2020

Uh oh!

zxyanliu Oct 6, 2020

Uh oh!

zxyanliu Oct 6, 2020

Uh oh!

zxyanliu Oct 6, 2020

Uh oh!

zxyanliu commented Oct 6, 2020 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

	cy.findByText('Regular expressions recognizer').click();
	cy.findByText('Regular expression recognizer').click();

	"message": "Regular expressions recognizer"
	"message": "Regular expression recognizer"

	displayName: () => formatMessage('Regular expressions recognizer'),
	displayName: () => formatMessage('Regular expression recognizer'),

fix: Updates regular expressions naming in recognizer types #4297

fix: Updates regular expressions naming in recognizer types #4297

Uh oh!

Conversation

stevkan commented Sep 30, 2020 • edited by a-b-r-o-w-n Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Task Item

Screenshots

Uh oh!

coveralls commented Sep 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

a-b-r-o-w-n left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

zxyanliu commented Sep 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

stevkan commented Oct 1, 2020

Uh oh!

zxyanliu Oct 6, 2020

Choose a reason for hiding this comment

Uh oh!

zxyanliu Oct 6, 2020

Choose a reason for hiding this comment

Uh oh!

zxyanliu Oct 6, 2020

Choose a reason for hiding this comment

Uh oh!

zxyanliu commented Oct 6, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

stevkan commented Sep 30, 2020 •

edited by a-b-r-o-w-n

Loading

coveralls commented Sep 30, 2020 •

edited

Loading

zxyanliu commented Sep 30, 2020 •

edited

Loading

zxyanliu commented Oct 6, 2020 •

edited

Loading