fix(core): filter empty URL parts in ApiService, do not next schedule…

…r on unsubscribe (#7000)
spinnaker · May 15, 2019 · b888ff5 · b888ff5
1 parent 52c637b
commit b888ff5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/scripts/modules/core/src/api/ApiService.ts b/app/scripts/modules/core/src/api/ApiService.ts
@@ -3,6 +3,7 @@ import { $q, $http } from 'ngimport';
 import { AuthenticationInitializer } from '../authentication/AuthenticationInitializer';
 import { SETTINGS } from 'core/config/settings';
 import { ICache } from 'core/cache';
+import { isNil } from 'lodash';
 
 export interface IRequestBuilder {
   config?: IRequestConfig;
@@ -166,7 +167,9 @@ export class API {
       method: '',
       url: this.baseUrl,
     };
-    urls.forEach((url: string) => (config.url = `${config.url}/${url.toString().replace(/^\/+/, '')}`));
+    urls
+      .filter(i => !isNil(i))
+      .forEach((url: string) => (config.url = `${config.url}/${url.toString().replace(/^\/+/, '')}`));
 
     return this.baseReturn(config);
   }

diff --git a/app/scripts/modules/core/src/scheduler/SchedulerFactory.ts b/app/scripts/modules/core/src/scheduler/SchedulerFactory.ts
@@ -82,7 +82,6 @@ export class SchedulerFactory {
       unsubscribe: () => {
         suspended = true;
         if (scheduler) {
-          scheduler.next(false);
           scheduler.unsubscribe();
         }
         scheduler = null;