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

add default trigger type #934

Merged
cwhitten merged 5 commits into from
Oct 1, 2019
+4 −5
Merged

add default trigger type #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4b0829
add default trigger type
liweitian Sep 23, 2019
dd8c366
Merge branch 'master' into liweitian/addDefaultTriggerType
liweitian Sep 23, 2019
9f95d77
Merge branch 'master' into liweitian/addDefaultTriggerType
cwhitten Sep 26, 2019
500634c
Merge branch 'master' into liweitian/addDefaultTriggerType
cwhitten Sep 30, 2019
9893508
Merge branch 'master' into liweitian/addDefaultTriggerType
cwhitten Oct 1, 2019
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
4 changes: 3 additions & 1 deletion Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
TriggerFormData,
TriggerFormDataErrors,
eventTypeKey,
intentTypeKey,
} from '../../utils/dialogUtil';
import { StoreContext } from '../../store';
import { DialogInfo } from '../../store/types';
Expand Down Expand Up @@ -47,7 +48,7 @@ interface TriggerCreationModalProps {

const initialFormData: TriggerFormData = {
errors: {},
$type: '',
$type: intentTypeKey,
name: '',
constraint: '',
eventType: '',
Expand Down Expand Up @@ -121,6 +122,7 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
onChange={onSelectTriggerType}
errorMessage={formData.errors.$type}
data-testid={'triggerTypeDropDown'}
defaultSelectedKey={intentTypeKey}
/>

{showEventDropDown && (
Expand Down
5 changes: 1 addition & 4 deletions Composer/packages/client/src/utils/dialogUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export function getDialog(dialogs: DialogInfo[], dialogId: string) {
}

export const eventTypeKey: string = SDKTypes.OnDialogEvent;
export const intentTypeKey: string = SDKTypes.OnIntent;

export function getFriendlyName(data) {
if (get(data, '$designer.name')) {
Expand Down Expand Up @@ -106,10 +107,6 @@ export function deleteTrigger(dialogs: DialogInfo[], dialogId: string, index: nu

export function getTriggerTypes(): IDropdownOption[] {
const triggerTypes: IDropdownOption[] = [
{
key: '',
text: '',
},
...dialogGroups[DialogGroup.EVENTS].types.map(t => {
let name = t as string;
const labelOverrides = ConceptLabels[t];
Expand Down