diff --git 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 index 29fc65aa22e..8d95a4808f6 100644 --- 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 @@ -351,8 +351,7 @@ describe('IscsiTargetFormComponent', () => { expect(req.request.body).toEqual({ clients: [ { - auth: { mutual_password: null, mutual_user: null, password: null, user: null }, - cdIsInGroup: false, + auth: { mutual_password: '', mutual_user: '', password: '', user: '' }, client_iqn: 'iqn.initiator', luns: [] } @@ -380,8 +379,7 @@ describe('IscsiTargetFormComponent', () => { expect(req.request.body).toEqual({ clients: [ { - auth: { mutual_password: null, mutual_user: null, password: null, user: null }, - cdIsInGroup: false, + auth: { mutual_password: '', mutual_user: '', password: '', user: '' }, client_iqn: 'iqn.initiator', luns: [] } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts index 5737f485219..3d502663ca5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts @@ -544,7 +544,7 @@ export class IscsiTargetFormComponent implements OnInit { } submit() { - const formValue = this.targetForm.value; + const formValue = _.cloneDeep(this.targetForm.value); const request = { target_iqn: this.targetForm.getValue('target_iqn'), @@ -581,17 +581,18 @@ export class IscsiTargetFormComponent implements OnInit { if (request.acl_enabled) { formValue.initiators.forEach((initiator) => { if (!initiator.auth.user) { - initiator.auth.user = null; + initiator.auth.user = ''; } if (!initiator.auth.password) { - initiator.auth.password = null; + initiator.auth.password = ''; } if (!initiator.auth.mutual_user) { - initiator.auth.mutual_user = null; + initiator.auth.mutual_user = ''; } if (!initiator.auth.mutual_password) { - initiator.auth.mutual_password = null; + initiator.auth.mutual_password = ''; } + delete initiator.cdIsInGroup; const newLuns = []; initiator.luns.forEach((lun) => {