Merge pull request #164 from mansurskTarento/cios-via-api

Cios via api

Author: venkykandagaddala

project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.html

@@ -54,7 +54,7 @@
                     </mat-panel-description>
                   </mat-expansion-panel-header>
                   <ws-app-transformations [providerDetails]="providerDetails"
-                    [transformationType]="'trasformContentJson'" (loadProviderDetails)="sendDetailsUpdateEvent()"
+                    [transformationType]="'transformProgressJson'" (loadProviderDetails)="sendDetailsUpdateEvent()"
                     (loadTablesData)="getTablesData()">
                   </ws-app-transformations>
                 </mat-expansion-panel>

project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/help-center-guide/help-center-guide.component.html

@@ -8,11 +8,13 @@
   </div>
   <div class="pt-5" *ngIf="showTopSection">
     <div class="flex gap-20 items-center justify-between">
-      <div class="flex-1 flex-col gap-4">
-        <p class="flex items-center" *ngFor="let note of helpCenterGuide?.guideNotes">
-          <mat-icon class="mat-icon mr-4">error_outline</mat-icon>
-          <span>{{note}}</span>
-        </p>
+      <div class="flex flex-column gap-4">
+        <ng-container *ngFor="let note of helpCenterGuide?.guideNotes">
+          <div class="flex w-full gap-3">
+            <div><mat-icon class="mat-icon mr-4">error_outline</mat-icon></div>
+            <div>{{note}}</div>
+          </div>
+        </ng-container>
       </div>
       <div class="pb-3">
         <div class="helpCenterDemo flex justify-end section-2">

project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.html

@@ -79,6 +79,9 @@
                           {{transforamtionForm.value[transFormControl.controlName]}}
                         </mat-option>
                       </ng-container>
+                      <mat-option value="">
+                        select
+                      </mat-option>
                     </mat-select>
                   </mat-form-field>
                   <span class="colun">:</span>

project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.ts

@@ -249,7 +249,7 @@ export class TransformationsComponent implements OnInit, OnChanges {
       })
 
     } else {
-      const message = 'Please provide all mandatory fields'
+      const message = this.transforamtionType === 'viaForm' ? 'Please provide all mandatory fields' : 'Please provide spec json'
       this.showSnackBar(message)
     }
   }
@@ -286,7 +286,7 @@ export class TransformationsComponent implements OnInit, OnChanges {
         header = 'Upload Course Catalog'
         break
       case 'transformProgressJson':
-        header = 'Upload Course Pregress'
+        header = 'Upload Course Progress'
         break
       case 'certificateTemplateUrl':
         header = 'Upload Course Certificate'

project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.ts

@@ -125,7 +125,10 @@ export class ViaApiComponent implements OnInit, OnChanges {
       }
     })
     this.viaApiFormGroup.controls.apiUrl.valueChanges.subscribe((event: string) => {
-      if (event !== this.displayUrl) {
+      const trimValue = event.replace(' ', '')
+      if (trimValue !== event) {
+        this.viaApiFormGroup.controls.apiUrl.patchValue(trimValue)
+      } else if (event !== this.displayUrl) {
         this.displayUrl = event
         this.apiUrlEdited = true
         this.constructParamsFormArray()
@@ -268,7 +271,7 @@ export class ViaApiComponent implements OnInit, OnChanges {
       this.authenticationFormGroup.controls.rawData.patchValue(authPayload)
     }
 
-    const transformContent = _.get(configurationDetails, this.transformationType, _.get(this.providerConfiguration, this.transformationType))
+    const transformContent = _.get(this.providerDetails, this.transformationType, _.get(this.providerConfiguration, this.transformationType))
     this.transformationSpecForm.patchValue(transformContent)
 
   }
@@ -323,13 +326,13 @@ export class ViaApiComponent implements OnInit, OnChanges {
   get getUpdateBtnText(): string {
     let btnText = ''
     if (this.transformationType === 'transformContentViaApi') {
-      if (this.providerConfiguration.trasformContentViaApi) {
+      if (this.providerConfiguration && this.providerConfiguration.transformContentViaApi) {
         btnText = 'Update Transform Content'
       } else {
         btnText = 'Save Transform Content'
       }
     } else if (this.transformationType === 'transformProgressViaApi') {
-      if (this.providerConfiguration.transformProgressViaApi) {
+      if (this.providerConfiguration && this.providerConfiguration.transformProgressViaApi) {
         btnText = 'Update Transform Progress'
       } else {
         btnText = 'Save Transform Progress'
@@ -392,6 +395,7 @@ export class ViaApiComponent implements OnInit, OnChanges {
     serviceDetails['serviceCode'] = this.servicesFormGroup.controls.serviceCode.value.toUpperCase()
     const params = this.getParamsAndUrl()
     const isFormData = this.bodyFormGroup.value.tableListFormArray[0].key ? true : false
+    const authPayload = _.get(this.authenticationFormGroup, 'value.rawData', '{}')
     const formBody = {
       isFormData,
       requestMethod: this.viaApiFormGroup.controls.apiType.value,
@@ -411,7 +415,7 @@ export class ViaApiComponent implements OnInit, OnChanges {
         headerMap: this.generateObjectFromForm(this.headersFormGroup.value.tableListFormArray),
         urlMap: this.generateObjectFromForm(this.paramsFormGroup.value.tableListFormArray, true)
       },
-      authPayload: this.authenticationFormGroup.value.rawData,
+      authPayload: authPayload ? authPayload : {},
       strictCache: serviceDetails.strictCache,
       strictCacheTimeInMinutes: serviceDetails.strictCacheTimeInMinutes
     }
@@ -477,7 +481,7 @@ export class ViaApiComponent implements OnInit, OnChanges {
       })
 
     } else {
-      const message = 'Please provide all mandatory fields'
+      const message = this.transforamtionType === 'viaForm' ? 'Please provide all mandatory fields' : 'Please provide spec json'
       this.showSnackBar(message)
     }
   }