set multiple tokens for qpu selection

generated/api-nisq/models/execute-analysis-result-request-dto.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
 export type ExecuteAnalysisResultRequestDto = {
   refreshToken?: string;
-  tokens?: Map<string, Map<string, string>>;
+  tokens?: {};
 };

generated/api-nisq/models/qpu-selection-dto.ts

@@ -4,7 +4,7 @@ export type QpuSelectionDto = {
   circuitLanguage?: string;
   circuitUrl?: string;
   qasmCode?: string;
-  tokens?: Map<string, Map<string, string>>;
+  tokens?: {};
   refreshToken?: string;
   circuitName?: string;
   preciseResultsPreference?: boolean;

src/app/components/algorithms/implementation-view/dialogs/implementation-nisq-analyzer-qpu-selection-dialog/implementation-nisq-analyzer-qpu-selection-dialog.component.ts

@@ -32,7 +32,7 @@ export class ImplementationNisqAnalyzerQpuSelectionDialogComponent
   selectedCompilers: string[] = [];
 
   ibmqEnabled = true;
-  ionqEnabled = true;
+  ionqEnabled = false;
   shortWaitingTimeEnabled = false;
   stableExecutionResultsEnabled = false;
   predictionAlgorithmInDialog = 'extra_trees_regressor';
@@ -136,11 +136,11 @@ export class ImplementationNisqAnalyzerQpuSelectionDialogComponent
       ),
     });
 
-    this.selectedVendors = ['ibmq', 'ionq'];
+    this.selectedVendors = ['ibmq'];
     for (const vendor of this.selectedVendors) {
       this.vendors.push(new FormControl(vendor));
     }
-    this.setCompilerOptions(this.vendors.value);
+    this.setCompilerOptions(this.selectedVendors);
     this.predictionAlgorithm.setValue('extra_trees_regressor');
     this.metaOptimizer.setValue('ada_boost_regressor');
     this.maxNumberOfCompiledCircuits.setValue(5);
@@ -167,7 +167,7 @@ export class ImplementationNisqAnalyzerQpuSelectionDialogComponent
   }
 
   updateCompilerSelection(compilerName: string, allowed: boolean): void {
-    if (allowed) {
+    if (allowed && !this.selectedCompilers.includes(compilerName)) {
       this.selectedCompilers.push(compilerName);
     } else {
       this.selectedCompilers = this.selectedCompilers.filter(
@@ -192,7 +192,6 @@ export class ImplementationNisqAnalyzerQpuSelectionDialogComponent
   }
 
   setCompilerOptions(vendors: string[]): void {
-    debugger;
     const setOfAllAvailableCompilers = new Set<string>();
     for (const vendor of vendors) {
       this.nisqAnalyzerService
@@ -201,22 +200,23 @@ export class ImplementationNisqAnalyzerQpuSelectionDialogComponent
           for (const availableCompiler of availableCompilers) {
             setOfAllAvailableCompilers.add(availableCompiler);
           }
+          setOfAllAvailableCompilers.forEach((compiler) => {
+            if (!this.selectedCompilers.includes(compiler)) {
+              this.selectedCompilers.push(compiler);
+            }
+          });
+          this.compilers.clear();
+          for (const compiler of setOfAllAvailableCompilers) {
+            this.compilers.push(new FormControl(compiler));
+          }
         });
-      setOfAllAvailableCompilers.forEach((compiler) =>
-        this.selectedCompilers.push(compiler)
-      );
-      this.compilers.clear();
-      for (const compiler of this.selectedCompilers) {
-        this.compilers.push(new FormControl(compiler));
-      }
     }
   }
 
   setIbmqEnabled(enabled: boolean): void {
     this.ibmqEnabled = enabled;
     if (enabled) {
       this.selectedVendors.push('ibmq');
-      this.setCompilerOptions(['ibmq']);
     } else {
       this.selectedVendors = this.selectedVendors.filter(
         (item) => item !== 'ibmq'
@@ -228,7 +228,6 @@ export class ImplementationNisqAnalyzerQpuSelectionDialogComponent
     this.ionqEnabled = enabled;
     if (enabled) {
       this.selectedVendors.push('ionq');
-      this.setCompilerOptions(['ionq']);
     } else {
       this.selectedVendors = this.selectedVendors.filter(
         (item) => item !== 'ionq'

src/app/components/algorithms/implementation-view/implementation-nisq-analyzer-qpu-selection/implementation-nisq-analyzer-qpu-selection.component.ts

@@ -215,17 +215,20 @@ export class ImplementationNisqAnalyzerQpuSelectionComponent
           this.analyzerJob = undefined;
           this.jobReady = false;
           refreshToken = this.planqkService.getRefreshToken();
+          const tokensToDeliver = this.setVendorTokens(
+            dialogResult.vendors,
+            dialogResult.ibmqToken,
+            dialogResult.awsToken,
+            dialogResult.awsSecretToken
+          );
+
+          debugger;
 
           const qpuSelectionDto: QpuSelectionDto = {
             allowedProviders: dialogResult.vendors,
             circuitLanguage: this.nisqImpl.language,
             circuitUrl: this.nisqImpl.fileLocation,
-            tokens: this.setVendorTokens(
-              dialogResult.vendors,
-              dialogResult.ibmqToken,
-              dialogResult.awsToken,
-              dialogResult.awsSecretToken
-            ),
+            tokens: tokensToDeliver,
             refreshToken,
             compilers: dialogResult.selectedCompilers,
             circuitName: this.nisqImpl.name,
@@ -368,21 +371,32 @@ export class ImplementationNisqAnalyzerQpuSelectionComponent
     ibmqToken: string,
     awsToken: string,
     awsSecretToken: string
-  ): Map<string, Map<string, string>> {
-    const providerTokens: Map<string, Map<string, string>> = new Map();
-    const rawTokens: Map<string, string> = new Map();
-    if (vendors.filter((vendor) => vendor === 'ibmq') != null) {
-      rawTokens.clear();
-      rawTokens.set('ibmq', ibmqToken);
-      providerTokens.set('ibmq', rawTokens);
+  ): {} {
+    const providerTokens = new Map<string, Map<string, string>>();
+    const rawTokensIbmq = new Map<string, string>();
+    const rawTokensIonq = new Map<string, string>();
+    debugger;
+    if (vendors.includes('ibmq')) {
+      rawTokensIbmq.set('ibmq', ibmqToken);
+      providerTokens.set('ibmq', rawTokensIbmq);
     }
-    if (vendors.filter((vendor) => vendor === 'ionq') != null) {
-      rawTokens.clear();
-      rawTokens.set('awsAccessKey', awsToken);
-      rawTokens.set('awsSecretKey', awsSecretToken);
-      providerTokens.set('ionq', rawTokens);
+    if (vendors.includes('ionq')) {
+      rawTokensIonq.set('awsAccessKey', awsToken);
+      rawTokensIonq.set('awsSecretKey', awsSecretToken);
+      providerTokens.set('ionq', rawTokensIonq);
     }
-    return providerTokens;
+
+    debugger;
+    // converting such that it can be delivered via HTTP
+    const convMap: { [props: string]: { [props: string]: string } } = {};
+    providerTokens.forEach((val: Map<string, string>, key: string) => {
+      const innerConvMap: { [props: string]: string } = {};
+      val.forEach((subVal: string, subkey: string) => {
+        innerConvMap[subkey] = subVal;
+      });
+      convMap[key] = innerConvMap;
+    });
+    return convMap;
   }
 
   hasExecutionResult(analysisResult: QpuSelectionResultDto): void {