From: Ernesto Puerta <37327689+epuertat@users.noreply.github.com>
Date: Wed, 2 Dec 2020 11:24:13 +0000 (+0100)
Subject: Merge pull request #37198 from tspmelo/wip-iscsi-fix-frontend
X-Git-Tag: v16.1.0~415
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec419e6971ebb232998b525007b5cf25e06f5102;p=ceph.git

Merge pull request #37198 from tspmelo/wip-iscsi-fix-frontend

mgr/dashboard: Allow managing iSCSI Initiator after removing from group

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
---

ec419e6971ebb232998b525007b5cf25e06f5102
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts
index d10ab0ef5da,f60471a0e86..494559e15ca
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts
@@@ -4,13 -4,14 +4,14 @@@ import { ReactiveFormsModule } from '@a
  import { ActivatedRoute } from '@angular/router';
  import { RouterTestingModule } from '@angular/router/testing';
  
+ import { SelectOption } from 'app/shared/components/select/select-option.model';
  import { ToastrModule } from 'ngx-toastr';
  
 -import { ActivatedRouteStub } from '../../../../testing/activated-route-stub';
 -import { configureTestBed, FormHelper, IscsiHelper } from '../../../../testing/unit-test-helper';
 -import { LoadingPanelComponent } from '../../../shared/components/loading-panel/loading-panel.component';
 -import { CdFormGroup } from '../../../shared/forms/cd-form-group';
 -import { SharedModule } from '../../../shared/shared.module';
 +import { LoadingPanelComponent } from '~/app/shared/components/loading-panel/loading-panel.component';
 +import { CdFormGroup } from '~/app/shared/forms/cd-form-group';
 +import { SharedModule } from '~/app/shared/shared.module';
 +import { ActivatedRouteStub } from '~/testing/activated-route-stub';
 +import { configureTestBed, FormHelper, IscsiHelper } from '~/testing/unit-test-helper';
  import { IscsiTargetFormComponent } from './iscsi-target-form.component';
  
  describe('IscsiTargetFormComponent', () => {