Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

draft: refactor the Trigger creation modal to be schema-driven #3832

Closed
yeze322 wants to merge 29 commits into from
Closed

draft: refactor the Trigger creation modal to be schema-driven #3832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
373e453
refactor: move TriggerCreationModal path
yeze322 Aug 11, 2020
9bed327
refactor: move styles out
yeze322 Aug 11, 2020
49d911c
refactor: move validators out
yeze322 Aug 11, 2020
b343000
refactor: remove unused code
yeze322 Aug 11, 2020
6cadfff
refactor: code clean up
yeze322 Aug 11, 2020
1612d42
refactor: move modal utils out of dialogUtils.ts
yeze322 Aug 12, 2020
9765abf
refactor: rename constants
yeze322 Aug 12, 2020
3466f59
refactor: move 'constants' path
yeze322 Aug 12, 2020
b50fb4c
refactor: convert getTriggerTypes to static json
yeze322 Aug 12, 2020
f3c9939
refactor: convert ActivityTypes, EventTypes to static config
yeze322 Aug 12, 2020
6019076
fix: revert SDKKinds usages in constant keys
yeze322 Aug 12, 2020
a1c0fd6
refactor: contextual `getTriggerTypes()`
yeze322 Aug 12, 2020
61d956a
refactor: move widget logic out
yeze322 Aug 12, 2020
57f9d73
refactor: extract OnIntent widget
yeze322 Aug 12, 2020
ab917db
refactor: optimize style file
yeze322 Aug 12, 2020
5dbf34a
refactor: remove useless export stmts
yeze322 Aug 12, 2020
32deaf6
refactor: move 2 type def
yeze322 Aug 12, 2020
d574974
doc: add comments for TriggerFormErrors
yeze322 Aug 12, 2020
13da78b
refactor: remove useless initial form error
yeze322 Aug 12, 2020
a279692
fix: define a different error field for custom event
yeze322 Aug 12, 2020
2c0e885
fix: use 'error.activity' to save activity L2 error
yeze322 Aug 12, 2020
c4f3292
refactor: sort validators
yeze322 Aug 12, 2020
d9f157c
fix: missing validator when select trigger type
yeze322 Aug 12, 2020
bf06b96
refactor: turn 'selectedType' checking to switch case
yeze322 Aug 12, 2020
af15fae
refactor: del first param redundant 'selectedType'
yeze322 Aug 12, 2020
cc86e3b
refactor: remove isRegex checking
yeze322 Aug 12, 2020
b79230c
refacotr: rename form error '$kind' to 'triggerType'
yeze322 Aug 12, 2020
6e2d3c2
refactor: remove dup checking of $kind in 'validateEventName()'
yeze322 Aug 12, 2020
34a6819
fix: not used import
yeze322 Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Composer/packages/client/__tests__/components/design.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { DialogInfo } from '@bfc/shared';
import { renderWithRecoil } from '../testUtils';
import { dialogs } from '../constants.json';
import { ProjectTree } from '../../src/components/ProjectTree/ProjectTree';
import { TriggerCreationModal } from '../../src/components/ProjectTree/TriggerCreationModal';
import TriggerCreationModal from '../../src/components/TriggerCreationModal';
import { CreateDialogModal } from '../../src/pages/design/createDialogModal';

jest.mock('@bfc/code-editor', () => {
Expand Down
47 changes: 0 additions & 47 deletions Composer/packages/client/__tests__/utils/dialogUtil.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ import {
updateRegExIntent,
createSelectedPath,
deleteTrigger,
getTriggerTypes,
getEventTypes,
getActivityTypes,
getFriendlyName,
getbreadcrumbLabel,
getSelected,
Expand Down Expand Up @@ -181,50 +178,6 @@ describe('deleteTrigger', () => {
});
});

describe('getTriggerTypes', () => {
it('return trigger types', () => {
const triggerTypes = getTriggerTypes();
expect(triggerTypes).toEqual([
{ key: 'Microsoft.OnIntent', text: 'Intent recognized' },
{ key: 'Microsoft.OnUnknownIntent', text: 'Unknown intent' },
{ key: 'Microsoft.OnDialogEvent', text: 'Dialog events' },
{ key: 'Microsoft.OnActivity', text: 'Activities' },
{ key: 'OnCustomEvent', text: 'Custom events' },
]);
});
});

describe('getEventTypes', () => {
it('return event types', () => {
const eventTypes = getEventTypes();
expect(eventTypes).toEqual([
{ key: 'Microsoft.OnBeginDialog', text: 'Dialog started (Begin dialog event)' },
{ key: 'Microsoft.OnCancelDialog', text: 'Dialog cancelled (Cancel dialog event)' },
{ key: 'Microsoft.OnError', text: 'Error occurred (Error event)' },
{ key: 'Microsoft.OnRepromptDialog', text: 'Re-prompt for input (Reprompt dialog event)' },
]);
});
});

describe('getActivityTypes', () => {
it('return activity types', () => {
const activityTypes = getActivityTypes();
expect(activityTypes).toEqual([
{ key: 'Microsoft.OnActivity', text: 'Activities (Activity received)' },
{ key: 'Microsoft.OnConversationUpdateActivity', text: 'Greeting (ConversationUpdate activity)' },
{ key: 'Microsoft.OnEndOfConversationActivity', text: 'Conversation ended (EndOfConversation activity)' },
{ key: 'Microsoft.OnEventActivity', text: 'Event received (Event activity)' },
{ key: 'Microsoft.OnHandoffActivity', text: 'Handover to human (Handoff activity)' },
{ key: 'Microsoft.OnInvokeActivity', text: 'Conversation invoked (Invoke activity)' },
{ key: 'Microsoft.OnTypingActivity', text: 'User is typing (Typing activity)' },
{ key: 'Microsoft.OnMessageActivity', text: 'Message received (Message received activity)' },
{ key: 'Microsoft.OnMessageDeleteActivity', text: 'Message deleted (Message deleted activity)' },
{ key: 'Microsoft.OnMessageReactionActivity', text: 'Message reaction (Message reaction activity)' },
{ key: 'Microsoft.OnMessageUpdateActivity', text: 'Message updated (Message updated activity)' },
]);
});
});

describe('getFriendlyName', () => {
it('return friendly name', () => {
const name = getFriendlyName(dialogs[0].content);
Expand Down
Loading