feat: propagate onSelectProfile handler from terminal to ProfileExplorer

Author: starpit

Diff for: plugins/plugin-codeflare/src/components/ProfileExplorer.tsx

@@ -50,7 +50,7 @@ import "../../web/scss/components/Dashboard/Description.scss"
 import "../../web/scss/components/ProfileExplorer/_index.scss"
 
 type Props = {
-  onSelectProfile?(profile: string): void
+  onSelectProfile?(profile: string, profiles?: import("madwizard").Profiles.Profile[]): void
   onSelectGuidebook?(guidebook: string): void
 }
 
@@ -105,7 +105,7 @@ export default class ProfileExplorer extends React.PureComponent<Props, State> {
       this.setState({ selectedProfile })
 
       if (this.props.onSelectProfile) {
-        this.props.onSelectProfile(selectedProfile)
+        this.props.onSelectProfile(selectedProfile, this.state.profiles)
       }
     }
   }
@@ -174,6 +174,11 @@ export default class ProfileExplorer extends React.PureComponent<Props, State> {
           )
         }
 
+        const profForEvent = selectedProfile || curState.selectedProfile
+        if (profForEvent && this.props.onSelectProfile) {
+          this.props.onSelectProfile(profForEvent, profiles)
+        }
+
         return {
           profiles,
           profilesDiff,
@@ -517,7 +522,7 @@ class ProfileCard extends React.PureComponent<ProfileCardProps, ProfileCardState
         <FlexItem>
           <Tooltip content="Reset the choices in this profile">
             <Button variant="link" className="codeflare--profile-explorer--reset-btn" onClick={this._handleReset}>
-              Reset
+              <Icons icon="Clear" />
             </Button>
           </Tooltip>
           <Tooltip content="Delete this profile">

Diff for: plugins/plugin-codeflare/src/components/RestartableTerminal.tsx

@@ -69,9 +69,10 @@ export default class RestartableTerminal extends React.PureComponent<Props, Stat
         tab: this.props.tab,
         env: this.props.env,
         quiet: true, // strange i know, but this forces PTY execution
-        onExit: () => {
+        onExit: async () => {
           if (this.mounted) {
             // restart, if still mounted
+            await new Promise((resolve) => setTimeout(resolve, 50000))
             this.initPty()
           }
         },

Diff for: plugins/plugin-codeflare/src/controller/terminal.tsx

@@ -43,7 +43,10 @@ export async function shell(args: Arguments) {
   }
 }
 
-type Props = Pick<BaseProps, "tab" | "repl">
+type Props = Pick<BaseProps, "tab" | "repl"> & {
+  onSelectProfile?(profile: string, profiles?: import("madwizard").Profiles.Profile[]): void
+}
+
 type State = Partial<Pick<BaseProps, "cmdline" | "env">> & {
   /** Internal error in rendering */
   error?: boolean
@@ -93,7 +96,13 @@ export class TaskTerminal extends React.PureComponent<Props, State> {
   }
 
   /** Event handler for switching to a different profile */
-  private readonly onSelectProfile = (selectedProfile: string) => this.setState({ selectedProfile })
+  private readonly onSelectProfile = (selectedProfile: string, profiles?: import("madwizard").Profiles.Profile[]) => {
+    this.setState({ selectedProfile })
+
+    if (this.props.onSelectProfile) {
+      this.props.onSelectProfile(selectedProfile, profiles)
+    }
+  }
 
   /** Event handler for switching to a different guidebook */
   private readonly onSelectGuidebook = (guidebook: string) => this.init(guidebook)