#422753 - Code refactoring

Author: ppelgmv

src/app/pages/assets/asset-editor-dialog/asset-editor-dialog.component.html

@@ -35,94 +35,94 @@
   <div *ngIf="storageTypeId === 'HttpData'">
     <mat-form-field class="form-field" color="accent">
       <mat-label>Name</mat-label>
-      <input [(ngModel)]="httpDataName" matInput>
+      <input [(ngModel)]="httpDataAddress.name" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Path</mat-label>
-      <input [(ngModel)]="path" matInput>
+      <input [(ngModel)]="httpDataAddress.path" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Base URL</mat-label>
-      <input [(ngModel)]="baseUrl" matInput>
+      <input [(ngModel)]="httpDataAddress.baseUrl" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Auth Key</mat-label>
-      <input [(ngModel)]="authKey" matInput>
+      <input [(ngModel)]="httpDataAddress.authKey" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Auth Code</mat-label>
-      <input [(ngModel)]="authCode" matInput>
+      <input [(ngModel)]="httpDataAddress.authCode" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Secret Name</mat-label>
-      <input [(ngModel)]="secretName" matInput>
+      <input [(ngModel)]="httpDataAddress.secretName" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Proxy Body</mat-label>
-      <input [(ngModel)]="proxyBody" matInput>
+      <input [(ngModel)]="httpDataAddress.proxyBody" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Proxy Path</mat-label>
-      <input [(ngModel)]="proxyPath" matInput>
+      <input [(ngModel)]="httpDataAddress.proxyPath" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Proxy Query Params</mat-label>
-      <input [(ngModel)]="proxyQueryParams" matInput>
+      <input [(ngModel)]="httpDataAddress.proxyQueryParams" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Proxy Method</mat-label>
-      <input [(ngModel)]="proxyMethod" matInput>
+      <input [(ngModel)]="httpDataAddress.roxyMethod" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Content Type</mat-label>
-      <input [(ngModel)]="contentType" matInput>
+      <input [(ngModel)]="httpDataAddress.contentType" matInput>
     </mat-form-field>
   </div>
 
   <div *ngIf="storageTypeId === 'AmazonS3'">
     <mat-form-field class="form-field" color="accent">
       <mat-label>Region</mat-label>
-      <input required [(ngModel)]="region" matInput>
+      <input required [(ngModel)]="amazonS3DataAddress.region" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Bucket Name</mat-label>
-      <input [(ngModel)]="bucketName" matInput>
+      <input [(ngModel)]="amazonS3DataAddress.bucketName" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Key Prefix</mat-label>
-      <input [(ngModel)]="keyPrefix" matInput>
+      <input [(ngModel)]="amazonS3DataAddress.keyPrefix" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Folder Name</mat-label>
-      <input [(ngModel)]="folderName" matInput>
+      <input [(ngModel)]="amazonS3DataAddress.folderName" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Access Key Id</mat-label>
-      <input [(ngModel)]="accessKeyId" matInput>
+      <input [(ngModel)]="amazonS3DataAddress.accessKeyId" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Secret Access Key</mat-label>
-      <input [(ngModel)]="secretAccessKey" matInput>
+      <input [(ngModel)]="amazonS3DataAddress.secretAccessKey" matInput>
     </mat-form-field>
 
     <mat-form-field class="form-field" color="accent">
       <mat-label>Endpoint Override</mat-label>
-      <input [(ngModel)]="endpointOverride" matInput>
+      <input [(ngModel)]="amazonS3DataAddress.endpointOverride" matInput>
     </mat-form-field>
   </div>
 

src/app/pages/assets/asset-editor-dialog/asset-editor-dialog.component.ts

@@ -20,28 +20,14 @@ export class AssetEditorDialog {
   contenttype: string = '';
   storageTypeId: string = '';
 
-  // AmazonS3 dataAddress attributes
-  region: string = '';
-  bucketName?: string;
-  keyPrefix?: string;
-  folderName?: string;
-  accessKeyId?: string;
-  secretAccessKey?: string;
-  endpointOverride?: string;
+  amazonS3DataAddress: AmazonS3DataAddress = {
+    type: 'AmazonS3',
+    region: ''
+  };
 
-  // HttpData dataAddress attributes
-  httpDataName?: string;
-  path?: string;
-  method?: string;
-  baseUrl?: string;
-  authKey?: string;
-  authCode?: string;
-  secretName?: string;
-  proxyBody?: string;
-  proxyPath?: string;
-  proxyQueryParams?: string;
-  proxyMethod?: string;
-  contentType?: string;
+  httpDataAddress: HttpDataAddress = {
+    type: 'HttpData'
+  };
 
 
   constructor(private dialogRef: MatDialogRef<AssetEditorDialog>,
@@ -58,34 +44,9 @@ export class AssetEditorDialog {
     let dataAddress: DataAddress;
 
     if (this.storageTypeId === DATA_ADDRESS_TYPES.amazonS3) {
-      const amazonS3DataAddress: AmazonS3DataAddress = {
-        type: 'AmazonS3',
-        region: this.region,
-        bucketName: this.bucketName,
-        keyPrefix: this.keyPrefix,
-        folderName: this.folderName,
-        accessKeyId: this.accessKeyId,
-        secretAccessKey: this.secretAccessKey,
-        endpointOverride: this.endpointOverride
-      };
-      dataAddress = amazonS3DataAddress;
+      dataAddress = this.amazonS3DataAddress;
     } else if (this.storageTypeId === DATA_ADDRESS_TYPES.httpData) {
-      const httpDataAddress: HttpDataAddress = {
-        type: 'HttpData',
-        name: this.httpDataName,
-        path: this.path,
-        method: this.method,
-        baseUrl: this.baseUrl,
-        authKey: this.authKey,
-        authCode: this.authCode,
-        secretName: this.secretName,
-        proxyBody: this.proxyBody,
-        proxyPath: this.proxyPath,
-        proxyQueryParams: this.proxyQueryParams,
-        proxyMethod: this.proxyMethod,
-        contentType: this.contentType,
-      };
-      dataAddress = httpDataAddress;
+      dataAddress = this.httpDataAddress;
     } else {
       this.notificationService.showError("Incorrect destination value");
       return;
@@ -113,7 +74,7 @@ export class AssetEditorDialog {
     if (!this.id || !this.storageTypeId){
       return false;
     } else {
-      if (this.storageTypeId === DATA_ADDRESS_TYPES.amazonS3 && !this.region) {
+      if (this.storageTypeId === DATA_ADDRESS_TYPES.amazonS3 && !this.amazonS3DataAddress.region) {
         return false;
       } else {
         return true;