fix: activityIndex can be 0 which is falsey (#1406)

* fix: activityIndex 0 is falsey * chore: remove name
microsoft · Dec 6, 2019 · cfbeaad · cfbeaad
1 parent e7244ef
commit cfbeaad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Utils/dialogEditing.ts b/src/Utils/dialogEditing.ts
@@ -470,10 +470,10 @@ export async function onEditTeach(
     // Generate activities
     const teachWithActivities = await fetchActivitiesAsync(app.appId, trainDialog, user.name, user.id)
     // If no index given, select last activity
-    const selectedActivity = activityIndex
+    const selectedActivity = activityIndex != null
         ? teachWithActivities.activities[activityIndex]
         : teachWithActivities.activities[teachWithActivities.activities.length - 1]
-    const clData: CLM.CLChannelData = { ...selectedActivity.channelData.clData, activityIndex: activityIndex }
+    const clData: CLM.CLChannelData = { ...selectedActivity.channelData.clData, activityIndex }
     selectedActivity.channelData.clData = clData
 
     await editHandler(trainDialog, selectedActivity, args)

diff --git a/src/components/modals/TeachSessionModal.tsx b/src/components/modals/TeachSessionModal.tsx
@@ -848,7 +848,7 @@ const mapStateToProps = (state: State) => {
 export interface ReceivedProps {
     isOpen: boolean
     onClose: (save: boolean, tags?: string[], description?: string, stopImport?: boolean) => void
-    onEditTeach: (historyIndex: number | null, args: DialogEditing.EditHandlerArgs | null, tags: string[], description: string, editHandler: (trainDialog: CLM.TrainDialog, activity: BB.Activity, args: DialogEditing.EditHandlerArgs) => any) => void
+    onEditTeach: (activityIndex: number | null, args: DialogEditing.EditHandlerArgs | null, tags: string[], description: string, editHandler: (trainDialog: CLM.TrainDialog, activity: BB.Activity, args: DialogEditing.EditHandlerArgs) => any) => void
     onInsertAction: (trainDialog: CLM.TrainDialog, activity: BB.Activity, args: DialogEditing.EditHandlerArgs) => any
     onInsertInput: (trainDialog: CLM.TrainDialog, activity: BB.Activity, args: DialogEditing.EditHandlerArgs) => any
     onChangeExtraction: (trainDialog: CLM.TrainDialog, activity: BB.Activity, args: DialogEditing.EditHandlerArgs) => any

diff --git a/src/routes/Apps/App/TrainDialogs.tsx b/src/routes/Apps/App/TrainDialogs.tsx
@@ -1762,7 +1762,7 @@ class TrainDialogs extends React.Component<Props, ComponentState> {
                         editingPackageId={this.props.editingPackageId}
                         originalTrainDialogId={this.state.originalTrainDialog ? this.state.originalTrainDialog.trainDialogId : null}
                         onClose={this.onCloseTeachSession}
-                        onEditTeach={(historyIndex, editHandlerArgs, tags, description, editHandler) => this.onEditTeach(historyIndex, editHandlerArgs ? editHandlerArgs : undefined, tags, description, editHandler)}
+                        onEditTeach={(activityIndex, editHandlerArgs, tags, description, editHandler) => this.onEditTeach(activityIndex, editHandlerArgs ? editHandlerArgs : undefined, tags, description, editHandler)}
                         onInsertAction={(trainDialog, activity, editHandlerArgs) => this.onInsertAction(trainDialog, activity, editHandlerArgs.isLastActivity!, editHandlerArgs.selectionType!)}
                         onInsertInput={(trainDialog, activity, editHandlerArgs) => this.onInsertInput(trainDialog, activity, editHandlerArgs.userInput!, editHandlerArgs.selectionType!)}
                         onDeleteTurn={(trainDialog, activity) => this.onDeleteTurn(trainDialog, activity)}
@@ -1920,7 +1920,7 @@ class TrainDialogs extends React.Component<Props, ComponentState> {
 
     // User has edited an Activity in a TeachSession
     private async onEditTeach(
-        historyIndex: number | null,
+        activityIndex: number | null,
         args: DialogEditing.EditHandlerArgs | undefined,
         tags: string[],
         description: string,
@@ -1932,7 +1932,7 @@ class TrainDialogs extends React.Component<Props, ComponentState> {
             }
 
             await DialogEditing.onEditTeach(
-                historyIndex,
+                activityIndex,
                 args,
                 tags,
                 description,