MB-47559: replace mnCollectionsService with mnKeyspaceSelectorService

in places where we call createCollectionSelector

This method has been moved into mnKeyspaceSelectorService,
so we should inject this service to be able to use
the method.

Change-Id: I6271822928a499e85ed2bbc50a50bf57cf983d49
Reviewed-on: http://review.couchbase.org/c/ns_server/+/158818
Well-Formed: Build Bot <[email protected]>
Reviewed-by: Matthew <[email protected]>
Tested-by: Pavel Blagodov <[email protected]>

Author: pavel-blagodov

priv/public/ui/app/components/directives/mn_user_roles_select_controller.js

@@ -66,7 +66,7 @@ function mnUserRolesSelectDirective() {
   }
 }
 
-function mnUserRolesSelectFormDirective(mnCollectionsServiceDowngrade) {
+function mnUserRolesSelectFormDirective(mnKeyspaceSelectorServiceDowngrade) {
   var mnUserRolesSelectForm = {
     restrict: 'AE',
     templateUrl: 'app/components/directives/mn_user_roles_select_form.html',
@@ -84,7 +84,7 @@ function mnUserRolesSelectFormDirective(mnCollectionsServiceDowngrade) {
     let params = $scope.item.params.map(v => v.split("_")[0]);
 
     $scope.mnCollectionSelectorService =
-      mnCollectionsServiceDowngrade.createCollectionSelector({
+      mnKeyspaceSelectorServiceDowngrade.createCollectionSelector({
         isRolesMode: true,
         component: {mnOnDestroy},
         buckets: $scope.state.parameters[$scope.item.params[0]],

priv/public/ui/app/mn.app.imports.js

@@ -24,6 +24,7 @@ import * as pluggableUIsModules from '/ui/pluggable-uis.js';
 import {MnPoolsServiceModule} from './mn.pools.service.js';
 import {MnAdminServiceModule} from './mn.admin.service.js';
 import {MnCollectionsServiceModule} from './mn.collections.service.js';
+import {MnKeyspaceSelectorServiceModule} from "./mn.keyspace.selector.service.js";
 
 import {MnKeyspaceSelectorModule} from './mn.keyspace.selector.module.js';
 
@@ -227,6 +228,7 @@ let mnAppImports = [
   MnCollectionsServiceModule,
   MnAdminServiceModule,
   MnPoolsServiceModule,
+  MnKeyspaceSelectorServiceModule,
   MnElementCraneModule.forRoot(),
   UIRouterUpgradeModule.forRoot({
     states: [

priv/public/ui/app/mn.keyspace.selector.downgrade.module.js

@@ -12,14 +12,14 @@ import angular from "../web_modules/angular.js";
 import {downgradeComponent,
         downgradeInjectable} from"../web_modules/@angular/upgrade/static.js";
 import {MnKeyspaceSelectorComponent} from "./mn.keyspace.selector.component.js";
-import {MnCollectionsService} from './mn.collections.service.js';
+import {MnKeyspaceSelectorService} from './mn.keyspace.selector.service.js';
 import {Subject, of} from "../web_modules/rxjs.js";
 
 export default "mnKeyspaceSelectorDowngradeModule";
 
 angular
   .module('mnKeyspaceSelectorDowngradeModule', [])
-  .factory('mnCollectionsServiceDowngrade', downgradeInjectable(MnCollectionsService))
+  .factory('mnKeyspaceSelectorServiceDowngrade', downgradeInjectable(MnKeyspaceSelectorService))
   .directive('mnKeyspaceSelectorDowngrade', downgradeComponent({
     component: MnKeyspaceSelectorComponent
   }));

priv/public/ui/app/mn.xdcr.module.js

@@ -18,7 +18,6 @@ import { MnSharedModule } from './mn.shared.module.js';
 import { MnInputFilterModule } from './mn.input.filter.module.js';
 import { MnPipesModule } from './mn.pipes.module.js';
 import { MnKeyspaceSelectorModule } from "./mn.keyspace.selector.module.js";
-import { MnKeyspaceSelectorServiceModule } from "./mn.keyspace.selector.service.js";
 import { MnSelectModule } from './mn.select.module.js';
 
 import { MnXDCRComponent } from "./mn.xdcr.component.js";
@@ -147,7 +146,6 @@ class MnXDCRModule {
         MnInputFilterModule,
         MnElementCraneModule,
         MnKeyspaceSelectorModule,
-        MnKeyspaceSelectorServiceModule,
 
         MnSharedModule,
         MnPipesModule,

priv/public/ui/app/mn_admin/mn_gsi_controller.js

@@ -140,8 +140,8 @@ function configure($stateProvider, $transitionsProvider) {
       }
     });
 }
-function mnGsiController($scope, mnGsiService, mnPoller, $state, mnCollectionsServiceDowngrade,
-                         poolDefault) {
+function mnGsiController($scope, mnGsiService, mnPoller, $state,
+                         mnKeyspaceSelectorServiceDowngrade, poolDefault) {
   var vm = this;
 
   vm.setIndexesView = setIndexesView;
@@ -184,7 +184,7 @@ function mnGsiController($scope, mnGsiService, mnPoller, $state, mnCollectionsSe
     }
 
     vm.mnCollectionSelectorService =
-      mnCollectionsServiceDowngrade.createCollectionSelector({
+      mnKeyspaceSelectorServiceDowngrade.createCollectionSelector({
         component: {mnOnDestroy},
         steps: ["bucket", "scope"]
       });