fix(core/instance): Fix instance details loading on first click

spinnaker · Mar 1, 2018 · a035097 · a035097
1 parent 990cd10
commit a035097
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/scripts/modules/core/src/instance/details/InstanceDetails.tsx b/app/scripts/modules/core/src/instance/details/InstanceDetails.tsx
@@ -31,17 +31,18 @@ export class InstanceDetails extends React.Component<IInstanceDetailsProps, IIns
   public componentDidMount() {
     const { versionedCloudProviderService } = ReactInjector;
 
-    this.props$.next(this.props);
     this.props$
       .do(() => this.setState({ loading: true, accountId: null }))
-      .mergeMap(({ app, $stateParams }) => {
+      .switchMap(({ app, $stateParams }) => {
         const acct = versionedCloudProviderService.getAccountForInstance($stateParams.provider, $stateParams.instanceId, app);
         return Observable.fromPromise(acct);
       })
       .takeUntil(this.destroy$)
       .subscribe((accountId: string) => {
         this.setState({ accountId, loading: false })
       });
+
+    this.props$.next(this.props);
   }
 
   public componentWillReceiveProps(nextProps: IInstanceDetailsProps) {