Merge pull request #457 from anvithks/hwfsFix

Fixed issues with Huawei FS create form. Fixes #453 and #454
sodafoundation · Oct 19, 2020 · aa0d6e6 · aa0d6e6
2 parents 894081b + 0191965
commit aa0d6e6
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 14 deletions.
diff --git a/src/app/business/block/cloud-file-share/create/cloud-file-share-create.component.html b/src/app/business/block/cloud-file-share/create/cloud-file-share-create.component.html
@@ -57,7 +57,7 @@ <h1>{{i18n.keyID['sds_creatFileShare']}}</h1>
     </form-item>
 
     <form-item *ngIf="cloudFileShareCreateForm.controls['protocols']" [required]="true" label="{{label.protocols}}">
-        <input formControlName="protocols" type="text" size="30" pInputText>
+        <p-multiSelect [options]="protocolTypeOptions" formControlName="protocols"  defaultLabel="You can choose multiple"></p-multiSelect>
     </form-item>
 
     <form-item *ngIf="cloudFileShareCreateForm.controls['tags']" [required]="true" label="{{label.tags}}">

diff --git a/src/app/business/block/cloud-file-share/create/cloud-file-share-create.component.ts b/src/app/business/block/cloud-file-share/create/cloud-file-share-create.component.ts
@@ -36,6 +36,8 @@ export class CloudFileShareCreateComponent implements OnInit{
     isVisible: boolean = false;
     showField: boolean = true;
     sfsType: string = "SFS";
+    protocolTypeOptions: any;
+    selectedProtocol;
     errorMessage = {
         "name": {
             required: "Name is required",
@@ -99,6 +101,17 @@ export class CloudFileShareCreateComponent implements OnInit{
             'description': new FormControl('', {validators:[Validators.maxLength(250),Validators.pattern(this.validRule.description)]}),
             'type' : new FormControl('cloudFS')
         });
+
+        this.protocolTypeOptions = [
+            {
+                label: 'NFS',
+                value: 'NFS'
+            },
+            {
+                label: 'CIFS',
+                value: 'CIFS'
+            }
+        ];
         this.getTypes();
         this.getBackends();
     }
@@ -156,6 +169,9 @@ export class CloudFileShareCreateComponent implements OnInit{
             if(this.cloudFileShareCreateForm.controls['sfsType']){
                 this.cloudFileShareCreateForm.removeControl('sfsType');
             }
+            if(this.cloudFileShareCreateForm.controls['size']){
+                this.cloudFileShareCreateForm.removeControl('size');
+            }
             this.cloudFileShareCreateForm.addControl('size', this.fb.control(''));
             this.cloudFileShareCreateForm.removeControl('availabilityZone');
             if(this.cloudFileShareCreateForm.get('metadata')){
@@ -178,6 +194,9 @@ export class CloudFileShareCreateComponent implements OnInit{
             this.cloudFileShareCreateForm.controls['name'].setValidators([Validators.required, Validators.minLength(2), Validators.maxLength(16), Validators.pattern(this.validRule.name),Utils.isExisted(this.allNamesForCheck)]);
             this.errorMessage.name.maxlength = "The file share name should have maximum 16 characters."
             this.cloudFileShareCreateForm.controls['name'].updateValueAndValidity();
+            if(this.cloudFileShareCreateForm.controls['size']){
+                this.cloudFileShareCreateForm.removeControl('size');
+            }
             this.cloudFileShareCreateForm.addControl('size', this.fb.control('1024', [Validators.required]));
             this.cloudFileShareCreateForm.addControl('availabilityZone', this.fb.control(''));
             this.cloudFileShareCreateForm.removeControl('encrypted');
@@ -206,9 +225,19 @@ export class CloudFileShareCreateComponent implements OnInit{
                 this.cloudFileShareCreateForm.removeControl('size');
             }
             this.cloudFileShareCreateForm.removeControl('availabilityZone');
+            this.cloudFileShareCreateForm.removeControl('encrypted');
+            this.cloudFileShareCreateForm.removeControl('encryptionSettings');
             this.cloudFileShareCreateForm.addControl('encrypted', this.fb.control(false, [Validators.required]));
-            if(this.cloudFileShareCreateForm.controls['encrypted']){
-                this.cloudFileShareCreateForm.addControl('encryptionSettings', this.fb.array([this.createEncryptionSettings('KmsKeyId', '')]));
+            if(!this.cloudFileShareCreateForm.controls['encryptionSettings']){
+                if(this.cloudFileShareCreateForm.controls['encrypted']){
+                    this.cloudFileShareCreateForm.get("encrypted").valueChanges.subscribe(
+                        (value:string)=>{
+                            if(value){
+                                this.cloudFileShareCreateForm.addControl('encryptionSettings', this.fb.array([this.createEncryptionSettings('KmsKeyId', '')]));
+                            }
+                        }
+                    );
+                }
             }
             this.cloudFileShareCreateForm.removeControl('tags');
             this.cloudFileShareCreateForm.addControl('tags', this.fb.array([this.createTags('Name','')]));
@@ -227,15 +256,30 @@ export class CloudFileShareCreateComponent implements OnInit{
                     }
                 );
             }
-
+            if(this.cloudFileShareCreateForm.controls['size']){
+                this.cloudFileShareCreateForm.removeControl('size');
+            }
             this.cloudFileShareCreateForm.addControl('size', this.fb.control('1', [Validators.required]));
             this.cloudFileShareCreateForm.addControl('availabilityZone', this.fb.control(''));
             this.cloudFileShareCreateForm.addControl('encrypted', this.fb.control(false, [Validators.required]));
-            this.cloudFileShareCreateForm.addControl('protocols', this.fb.control('NFS'));
-            if(this.cloudFileShareCreateForm.controls['encrypted']){
-                this.cloudFileShareCreateForm.addControl('encryptionSettings', this.fb.array([this.createEncryptionSettings('KmsKeyId', '')]));
-                this.addNextEncryptionSettings('KmsKeyName', 'sfs/default');
-                this.addNextEncryptionSettings('DomainId', '');
+            this.cloudFileShareCreateForm.addControl('protocols', this.fb.control(''));
+            this.cloudFileShareCreateForm.removeControl('encrypted');
+            this.cloudFileShareCreateForm.removeControl('encryptionSettings');
+            this.cloudFileShareCreateForm.addControl('encrypted', this.fb.control(false, [Validators.required]));
+            if(!this.cloudFileShareCreateForm.controls['encryptionSettings']){
+                if(this.cloudFileShareCreateForm.controls['encrypted']){
+                    this.cloudFileShareCreateForm.get("encrypted").valueChanges.subscribe(
+                        (value:string)=>{
+                            if(value){
+                                this.cloudFileShareCreateForm.addControl('encryptionSettings', this.fb.array([this.createEncryptionSettings('KmsKeyId', '')]));
+                                this.addNextEncryptionSettings('KmsKeyName', 'sfs/default');
+                                this.addNextEncryptionSettings('DomainId', '');
+                            } else{
+                                this.cloudFileShareCreateForm.removeControl('encryptionSettings');
+                            }
+                        }
+                    );
+                }
             }
             this.cloudFileShareCreateForm.removeControl('tags');
             this.cloudFileShareCreateForm.addControl('tags', this.fb.array([this.createTags('Name','')]));
@@ -376,11 +420,11 @@ export class CloudFileShareCreateComponent implements OnInit{
             dataArr['tags'] = value['tags'];
         }
         if(value['protocols']){
-            var protoArr:string[];
-            protoArr = [value['protocols']]
-            dataArr['protocols'] = protoArr;
+            dataArr['protocols'] = [];
+            value['protocols'].forEach(protoElement => {
+                dataArr['protocols'].push(protoElement);
+            });
         }
-
         return dataArr;
     }
     onSubmit(value){

diff --git a/src/app/business/block/cloud-file-share/create/cloud-file-share-create.module.ts b/src/app/business/block/cloud-file-share/create/cloud-file-share-create.module.ts
@@ -7,7 +7,7 @@ import { CloudFileShareCreateComponent } from './cloud-file-share-create.compone
 import { RouterModule } from '@angular/router';
 import {
     DataTableModule, DropMenuModule, DialogModule, FormModule, InputTextModule, InputTextareaModule,
-    DropdownModule, ConfirmationService, ConfirmDialogModule, CalendarModule, CheckboxModule, InputSwitchModule,
+    DropdownModule, MultiSelectModule, ConfirmationService, ConfirmDialogModule, CalendarModule, CheckboxModule, InputSwitchModule,
     TableModule, TabViewModule, ButtonModule, SpinnerModule, GrowlModule, RadioButtonModule
 } from '../../../../components/common/api';
 import { HttpService } from '../../../../shared/service/Http.service';
@@ -37,6 +37,7 @@ let routers = [{
     InputTextareaModule,
     DataTableModule,
     DropdownModule,
+    MultiSelectModule,
     DropMenuModule,
     DialogModule,
     FormModule,